Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp772402pxb; Thu, 23 Sep 2021 10:13:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvlJqOUDk2k4rAx83eb6aVGWP6WwCVuEtah51UaBMiukTIzqRul4kZlQy7IdIr/Ih393V2 X-Received: by 2002:a05:6e02:4a8:: with SMTP id e8mr4712800ils.248.1632417231964; Thu, 23 Sep 2021 10:13:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632417231; cv=none; d=google.com; s=arc-20160816; b=GMKo8Yg16KoA1P5/w+qzMA8OaWZC4IY3/0YExt5trUADZeq4JYwesHjFOsfnL0XG/j aXYVyaVn9uCYc/IC7meVbNRmSo3dOdNITlkjzaqiODkSPQMRmh7A+M8y2tJjlRMPGSky 2iNpP9tVcSrF+nVVh+jfdTDE7MZ+ZAKrJk51asrkQqZy7AmgSxbqQFE+hMdqQjsWotPT 71K9JdVz3scXHMgbPeftZ3n89HDitYzdGeTrPvFEeo6Zpuavq0O4iAGsAY3bGCFLpy3M qp5kOXO9VyRnJt1ygrosRlgPXWBIAQBfPFQvXzRdJE0ruYNRY4qtW2V4R0NpP/KLycXc SQjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Ac7yBOkRv+lJfM7PlsuCbUEvMv969AL3RGsgnMs1JdA=; b=TQJkg1jZmaHm12+H0RyyNO4EYYqdtwNhtjtRghBY8tt4qwXZZvbncclZ1V6SvfYkHM nX1bbzvGYwTPcfNPMjdG3KPNWh79a2fHw9+wFgid/+DAwNVqNKSc5mpD3iANBsWtKrVj o5i1YFZWK+a6zskRcJ/Uvr01NNBUeuks8M9gS4xbjnhJuLj2R97vkowOJT8paZo1tG60 khOVDIQjEvM0VqpHdL6sq+z6Mf6ZO5EB6/Abfnrid8k7SsNWkazuU0uiRx2O9f/BG4Tr qLN9osLOlIClg4NRAOAdI0aRMVLW5JRd2fjuNY3vkH0Elfm/JnE4PK0iSlduGPtG7mAW H3Bw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g21si4085414ioe.31.2021.09.23.10.13.38; Thu, 23 Sep 2021 10:13:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242538AbhIWRNx (ORCPT + 99 others); Thu, 23 Sep 2021 13:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242578AbhIWRNs (ORCPT ); Thu, 23 Sep 2021 13:13:48 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41C91C061574; Thu, 23 Sep 2021 10:12:16 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: tonyk) with ESMTPSA id 4B9A41F4460A From: =?UTF-8?q?Andr=C3=A9=20Almeida?= To: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , linux-kernel@vger.kernel.org, Steven Rostedt , Sebastian Andrzej Siewior Cc: kernel@collabora.com, krisman@collabora.com, linux-api@vger.kernel.org, libc-alpha@sourceware.org, mtk.manpages@gmail.com, Davidlohr Bueso , Arnd Bergmann , =?UTF-8?q?Andr=C3=A9=20Almeida?= Subject: [PATCH v2 11/22] futex: Rename: match_futex() Date: Thu, 23 Sep 2021 14:11:00 -0300 Message-Id: <20210923171111.300673-12-andrealmeid@collabora.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923171111.300673-1-andrealmeid@collabora.com> References: <20210923171111.300673-1-andrealmeid@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra In order to prepare introducing these symbols into the global namespace; rename: s/match_futex/futex_match/g Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: André Almeida Signed-off-by: André Almeida --- kernel/futex/core.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index a26045e17fac..30246e63e74b 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -324,13 +324,13 @@ struct futex_hash_bucket *futex_hash(union futex_key *key) /** - * match_futex - Check whether two futex keys are equal + * futex_match - Check whether two futex keys are equal * @key1: Pointer to key1 * @key2: Pointer to key2 * * Return 1 if two futex_keys are equal, 0 otherwise. */ -static inline int match_futex(union futex_key *key1, union futex_key *key2) +static inline int futex_match(union futex_key *key1, union futex_key *key2) { return (key1 && key2 && key1->both.word == key2->both.word @@ -381,7 +381,7 @@ futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout, * a new sequence number and will _NOT_ match, even though it is the exact same * file. * - * It is important that match_futex() will never have a false-positive, esp. + * It is important that futex_match() will never have a false-positive, esp. * for PI futexes that can mess up the state. The above argues that false-negatives * are only possible for malformed programs. */ @@ -648,7 +648,7 @@ struct futex_q *futex_top_waiter(struct futex_hash_bucket *hb, union futex_key * struct futex_q *this; plist_for_each_entry(this, &hb->chain, list) { - if (match_futex(&this->key, key)) + if (futex_match(&this->key, key)) return this; } return NULL; @@ -808,7 +808,7 @@ int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) spin_lock(&hb->lock); plist_for_each_entry_safe(this, next, &hb->chain, list) { - if (match_futex (&this->key, &key)) { + if (futex_match (&this->key, &key)) { if (this->pi_state || this->rt_waiter) { ret = -EINVAL; break; @@ -928,7 +928,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, } plist_for_each_entry_safe(this, next, &hb1->chain, list) { - if (match_futex (&this->key, &key1)) { + if (futex_match (&this->key, &key1)) { if (this->pi_state || this->rt_waiter) { ret = -EINVAL; goto out_unlock; @@ -942,7 +942,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, if (op_ret > 0) { op_ret = 0; plist_for_each_entry_safe(this, next, &hb2->chain, list) { - if (match_futex (&this->key, &key2)) { + if (futex_match (&this->key, &key2)) { if (this->pi_state || this->rt_waiter) { ret = -EINVAL; goto out_unlock; @@ -1199,7 +1199,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1, return -EINVAL; /* Ensure we requeue to the expected futex. */ - if (!match_futex(top_waiter->requeue_pi_key, key2)) + if (!futex_match(top_waiter->requeue_pi_key, key2)) return -EINVAL; /* Ensure that this does not race against an early wakeup */ @@ -1334,7 +1334,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, * The check above which compares uaddrs is not sufficient for * shared futexes. We need to compare the keys: */ - if (requeue_pi && match_futex(&key1, &key2)) + if (requeue_pi && futex_match(&key1, &key2)) return -EINVAL; hb1 = futex_hash(&key1); @@ -1469,7 +1469,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, if (task_count - nr_wake >= nr_requeue) break; - if (!match_futex(&this->key, &key1)) + if (!futex_match(&this->key, &key1)) continue; /* @@ -1496,7 +1496,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, } /* Ensure we requeue to the expected futex for requeue_pi. */ - if (!match_futex(this->requeue_pi_key, &key2)) { + if (!futex_match(this->requeue_pi_key, &key2)) { ret = -EINVAL; break; } @@ -2033,7 +2033,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * The check above which compares uaddrs is not sufficient for * shared futexes. We need to compare the keys: */ - if (match_futex(&q.key, &key2)) { + if (futex_match(&q.key, &key2)) { futex_q_unlock(hb); ret = -EINVAL; goto out; -- 2.33.0