Skip to content

L
linux-davinci
Commit b3513fca authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files
Options

[GFS2] Incremental patch to fix compiler warning 

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 15c7cee7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
fs/gfs2/rgrp.c
View file @ b3513fca
...@@ -133,10 +133,9 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal, ...@@ -133,10 +133,9 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal,
u32 blk = goal; u32 blk = goal;
unsigned int bit, bitlong; unsigned int bit, bitlong;
unsigned long *plong, plong55; unsigned long *plong, plong55;
static int c = 0;
byte = buffer + (goal / GFS2_NBBY); byte = buffer + (goal / GFS2_NBBY);
plong = buffer + (goal / GFS2_NBBY); plong = (unsigned long *)(buffer + (goal / GFS2_NBBY));
bit = (goal % GFS2_NBBY) * GFS2_BIT_SIZE; bit = (goal % GFS2_NBBY) * GFS2_BIT_SIZE;
bitlong = bit; bitlong = bit;
#if BITS_PER_LONG == 32 #if BITS_PER_LONG == 32
...@@ -152,10 +151,8 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal, ...@@ -152,10 +151,8 @@ static u32 gfs2_bitfit(unsigned char *buffer, unsigned int buflen, u32 goal,
blk += sizeof(unsigned long) * GFS2_NBBY; blk += sizeof(unsigned long) * GFS2_NBBY;
continue; continue;
} }
if (((*byte >> bit) & GFS2_BIT_MASK) == old_state) { if (((*byte >> bit) & GFS2_BIT_MASK) == old_state)
c++;
return blk; return blk;
}
bit += GFS2_BIT_SIZE; bit += GFS2_BIT_SIZE;
if (bit >= 8) { if (bit >= 8) {
bit = 0; bit = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment