From 5d26f736f95e5394856250604a3c719804a60b4d Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 23 Apr 2009 08:54:02 +0100
Subject: [PATCH] --- yaml --- r: 144014 b: refs/heads/master c:
 d8bd504ab800c8e9aadb983914a33e7166320bec h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/rgrp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f6655918e652..de62140240be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 952043ac12a117d8e94bddd9088338d7ad20ca7d
+refs/heads/master: d8bd504ab800c8e9aadb983914a33e7166320bec
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index f03d024038ea..c9786a46cdfc 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -212,8 +212,7 @@ static u32 gfs2_bitfit(const u8 *buf, const unsigned int len,
 	if (tmp == 0)
 		return BFITNOENT;
 	ptr--;
-	bit = fls64(tmp);
-	bit--;		/* fls64 always adds one to the bit count */
+	bit = __ffs64(tmp);
 	bit /= 2;	/* two bits per entry in the bitmap */
 	return (((const unsigned char *)ptr - buf) * GFS2_NBBY) + bit;
 }