mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Thomas Meyer <thomas@m3y3r.de>
To: linux-kernel@vger.kernel.org
Cc: linux@rasmusvillemoes.dk, Thomas Meyer <thomas@m3y3r.de>
Subject: [PATCH] kernel/groups.c: use bsearch library function
Date: Mon,  7 Oct 2019 21:26:32 +0200	[thread overview]
Message-ID: <20191007192632.29535-1-thomas@m3y3r.de> (raw)

commit b7b2562f7252 ("kernel/groups.c: use sort library function")
introduced the sort library function.
also use the bsearch library function instead of open-coding the binary
search.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
---
 kernel/groups.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/kernel/groups.c b/kernel/groups.c
index daae2f2dc6d4f..69561a9cb4d39 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -2,6 +2,7 @@
 /*
  * Supplementary group IDs
  */
+#include <linux/bsearch.h>
 #include <linux/cred.h>
 #include <linux/export.h>
 #include <linux/slab.h>
@@ -96,22 +97,12 @@ EXPORT_SYMBOL(groups_sort);
 /* a simple bsearch */
 int groups_search(const struct group_info *group_info, kgid_t grp)
 {
-	unsigned int left, right;
-
 	if (!group_info)
 		return 0;
 
-	left = 0;
-	right = group_info->ngroups;
-	while (left < right) {
-		unsigned int mid = (left+right)/2;
-		if (gid_gt(grp, group_info->gid[mid]))
-			left = mid + 1;
-		else if (gid_lt(grp, group_info->gid[mid]))
-			right = mid;
-		else
-			return 1;
-	}
+	if (bsearch(&grp, group_info->gid, group_info->ngroups,
+		    sizeof(*group_info->gid), gid_cmp))
+		return 1;
 	return 0;
 }
 
-- 
2.21.0


             reply	other threads:[~2019-10-07 19:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-07 19:26 Thomas Meyer [this message]
2019-10-09  7:46 ` Rasmus Villemoes
2019-10-09 18:35   ` Thomas Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191007192632.29535-1-thomas@m3y3r.de \
    --to=thomas@m3y3r.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®