malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GFS2: Change variable blk to biblk

Browse Source 
In the resource group code, we have no less than three different
kinds of block references: block relative to the file system (u64),
block relative to the rgrp (u32), and block relative to the bitmap.
This is a small step to making the code more readable; it renames
variable blk to biblk to solidify in my mind that it's relative to
the bitmap and nothing else.

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-12 08:41:43 -04:00 committed by Steven Whitehouse
parent 886b141675
commit 9598d25ed9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/gfs2/rgrp.c
View File

@ -1297,7 +1297,7 @@ static u32 rgblk_search(struct gfs2_rgrpd *rgd, u32 goal, unsigned char state,
{ {
struct gfs2_bitmap *bi = NULL; struct gfs2_bitmap *bi = NULL;
const u32 length = rgd->rd_length; const u32 length = rgd->rd_length;
u32 blk = BFITNOENT; u32 biblk = BFITNOENT;
unsigned int buf, x; unsigned int buf, x;
const u8 *buffer = NULL; const u8 *buffer = NULL;
@ -1334,8 +1334,8 @@ do_search:
if (state != GFS2_BLKST_UNLINKED && bi->bi_clone) if (state != GFS2_BLKST_UNLINKED && bi->bi_clone)
buffer = bi->bi_clone + bi->bi_offset; buffer = bi->bi_clone + bi->bi_offset;
blk = gfs2_bitfit(buffer, bi->bi_len, goal, state); biblk = gfs2_bitfit(buffer, bi->bi_len, goal, state);
if (blk != BFITNOENT) if (biblk != BFITNOENT)
break; break;
if ((goal == 0) && (state == GFS2_BLKST_FREE)) if ((goal == 0) && (state == GFS2_BLKST_FREE))
@ -1348,10 +1348,10 @@ skip:
goal = 0; goal = 0;
} }
if (blk != BFITNOENT) if (biblk != BFITNOENT)
*rbi = bi; *rbi = bi;
return blk; return biblk;
} }
/** /**