From b3513fca7e41965d85125c9770ce5f8fd4ff509a Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 12 Dec 2007 09:24:08 -0600
Subject: [PATCH] [GFS2] Incremental patch to fix compiler warning
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
fs/gfs2/rgrp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index d7ff9cf6653fa..68c4bf363c466 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -133,10 +133,9 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal,
u32 blk = goal;
unsigned int bit, bitlong;
unsigned long *plong, plong55;
- static int c = 0;
byte = buffer + (goal / GFS2_NBBY);
- plong = buffer + (goal / GFS2_NBBY);
+ plong = (unsigned long *)(buffer + (goal / GFS2_NBBY));
bit = (goal % GFS2_NBBY) * GFS2_BIT_SIZE;
bitlong = bit;
#if BITS_PER_LONG == 32
@@ -152,10 +151,8 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal,
blk += sizeof(unsigned long) * GFS2_NBBY;
continue;
}
- if (((*byte >> bit) & GFS2_BIT_MASK) == old_state) {
- c++;
+ if (((*byte >> bit) & GFS2_BIT_MASK) == old_state)
return blk;
- }
bit += GFS2_BIT_SIZE;
if (bit >= 8) {
bit = 0;
--
GitLab