mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-11 07:30:16 +00:00
GFS2: Change variable blk to biblk
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:
parent
886b141675
commit
9598d25ed9
@ -1297,7 +1297,7 @@ static u32 rgblk_search(struct gfs2_rgrpd *rgd, u32 goal, unsigned char state,
|
||||
{
|
||||
struct gfs2_bitmap *bi = NULL;
|
||||
const u32 length = rgd->rd_length;
|
||||
u32 blk = BFITNOENT;
|
||||
u32 biblk = BFITNOENT;
|
||||
unsigned int buf, x;
|
||||
const u8 *buffer = NULL;
|
||||
|
||||
@ -1334,8 +1334,8 @@ do_search:
|
||||
if (state != GFS2_BLKST_UNLINKED && bi->bi_clone)
|
||||
buffer = bi->bi_clone + bi->bi_offset;
|
||||
|
||||
blk = gfs2_bitfit(buffer, bi->bi_len, goal, state);
|
||||
if (blk != BFITNOENT)
|
||||
biblk = gfs2_bitfit(buffer, bi->bi_len, goal, state);
|
||||
if (biblk != BFITNOENT)
|
||||
break;
|
||||
|
||||
if ((goal == 0) && (state == GFS2_BLKST_FREE))
|
||||
@ -1348,10 +1348,10 @@ skip:
|
||||
goal = 0;
|
||||
}
|
||||
|
||||
if (blk != BFITNOENT)
|
||||
if (biblk != BFITNOENT)
|
||||
*rbi = bi;
|
||||
|
||||
return blk;
|
||||
return biblk;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user