From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Thu, 12 Apr 2012 14:10:12 +0100 Subject: [Cluster-devel] [GFS2 PATCH] GFS2: Change variable blk to biblk In-Reply-To: <4f6998ec-c1cb-4c71-9399-25ace6ddad06@zmail12.collab.prod.int.phx2.redhat.com> References: <4f6998ec-c1cb-4c71-9399-25ace6ddad06@zmail12.collab.prod.int.phx2.redhat.com> Message-ID: <1334236212.2697.13.camel@menhir> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Now in the -nmw tree. Thanks, Steve. On Thu, 2012-04-12 at 08:41 -0400, Bob Peterson wrote: > Hi, > > This patch renames a variable from blk to biblk for clarity's sake. > > Regards, > > Bob Peterson > Red Hat GFS > > Signed-off-by: Bob Peterson > -- > Author: Bob Peterson > Date: Thu Apr 12 08:24:57 2012 -0500 > > 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. > > diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c > index 5968eae..7a1cf67 100644 > --- a/fs/gfs2/rgrp.c > +++ b/fs/gfs2/rgrp.c > @@ -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; > } > > /** >