OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GFS2: Eliminate offset parameter to gfs2_setbit 

This patch eliminates a redundant parameter.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2012-04-11 13:01:07 -04:00 committed by Steven Whitehouse
parent 36f5580be1
commit 29c578f567
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/gfs2/rgrp.c
View File

@ -70,24 +70,25 @@ static u32 rgblk_search(struct gfs2_rgrpd *rgd, u32 goal,
/** /**
* gfs2_setbit - Set a bit in the bitmaps * gfs2_setbit - Set a bit in the bitmaps
* @buffer: the buffer that holds the bitmaps * @rgd: the resource group descriptor
* @buflen: the length (in bytes) of the buffer * @buf1: the primary buffer that holds the bitmaps
* @buf2: the clone buffer that holds the bitmaps
* @bi: the bitmap structure
* @block: the block to set * @block: the block to set
* @new_state: the new state of the block * @new_state: the new state of the block
* *
*/ */
static inline void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buf1, static inline void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buf1,
unsigned char *buf2, unsigned int offset, unsigned char *buf2, struct gfs2_bitmap *bi,
struct gfs2_bitmap *bi, u32 block, u32 block, unsigned char new_state)
unsigned char new_state)
{ {
unsigned char *byte1, *byte2, *end, cur_state; unsigned char *byte1, *byte2, *end, cur_state;
unsigned int buflen = bi->bi_len; unsigned int buflen = bi->bi_len;
const unsigned int bit = (block % GFS2_NBBY) * GFS2_BIT_SIZE; const unsigned int bit = (block % GFS2_NBBY) * GFS2_BIT_SIZE;
byte1 = buf1 + offset + (block / GFS2_NBBY); byte1 = buf1 + bi->bi_offset + (block / GFS2_NBBY);
end = buf1 + offset + buflen; end = buf1 + bi->bi_offset + buflen;
BUG_ON(byte1 >= end); BUG_ON(byte1 >= end);
@ -110,7 +111,7 @@ static inline void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buf1,
*byte1 ^= (cur_state ^ new_state) << bit; *byte1 ^= (cur_state ^ new_state) << bit;
if (buf2) { if (buf2) {
byte2 = buf2 + offset + (block / GFS2_NBBY); byte2 = buf2 + bi->bi_offset + (block / GFS2_NBBY);
cur_state = (*byte2 >> bit) & GFS2_BIT_MASK; cur_state = (*byte2 >> bit) & GFS2_BIT_MASK;
*byte2 ^= (cur_state ^ new_state) << bit; *byte2 ^= (cur_state ^ new_state) << bit;
} }
@ -1370,7 +1371,7 @@ static u64 gfs2_alloc_extent(struct gfs2_rgrpd *rgd, struct gfs2_bitmap *bi,
*n = 0; *n = 0;
buffer = bi->bi_bh->b_data + bi->bi_offset; buffer = bi->bi_bh->b_data + bi->bi_offset;
gfs2_trans_add_bh(rgd->rd_gl, bi->bi_bh, 1); gfs2_trans_add_bh(rgd->rd_gl, bi->bi_bh, 1);
gfs2_setbit(rgd, bi->bi_bh->b_data, bi->bi_clone, bi->bi_offset, gfs2_setbit(rgd, bi->bi_bh->b_data, bi->bi_clone,
bi, blk, dinode ? GFS2_BLKST_DINODE : GFS2_BLKST_USED); bi, blk, dinode ? GFS2_BLKST_DINODE : GFS2_BLKST_USED);
(*n)++; (*n)++;
goal = blk; goal = blk;
@ -1381,7 +1382,7 @@ static u64 gfs2_alloc_extent(struct gfs2_rgrpd *rgd, struct gfs2_bitmap *bi,
if (gfs2_testbit(rgd, buffer, bi->bi_len, goal) != if (gfs2_testbit(rgd, buffer, bi->bi_len, goal) !=
GFS2_BLKST_FREE) GFS2_BLKST_FREE)
break; break;
gfs2_setbit(rgd, bi->bi_bh->b_data, bi->bi_clone, bi->bi_offset, gfs2_setbit(rgd, bi->bi_bh->b_data, bi->bi_clone,
bi, goal, GFS2_BLKST_USED); bi, goal, GFS2_BLKST_USED);
(*n)++; (*n)++;
} }
@ -1439,7 +1440,7 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
bi->bi_len); bi->bi_len);
} }
gfs2_trans_add_bh(rgd->rd_gl, bi->bi_bh, 1); gfs2_trans_add_bh(rgd->rd_gl, bi->bi_bh, 1);
gfs2_setbit(rgd, bi->bi_bh->b_data, NULL, bi->bi_offset, gfs2_setbit(rgd, bi->bi_bh->b_data, NULL,
bi, buf_blk, new_state); bi, buf_blk, new_state);
} }