Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=9531018a56554c... Commit: 9531018a56554c83f557fab33563d92a7266d954 Parent: 508a5bc17b882ef71c176156f3b2321bef7cca0f Author: Bob Peterson rpeterso@redhat.com AuthorDate: Mon Aug 8 13:28:08 2011 -0500 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Fri Apr 5 06:24:25 2013 -0700
fsck.gfs2: fsck.gfs2: Delete vestigial buffer_head in check_leaf
This patch eliminates a variable bh from all the check_leaf metawalk functions because it is no longer referenced.
rhbz#877150 --- gfs2/fsck/metawalk.c | 10 ++++------ gfs2/fsck/metawalk.h | 5 ++--- gfs2/fsck/pass1.c | 14 ++++++-------- 3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 7e1f1ef..5b2eb6a 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -701,7 +701,7 @@ static int check_leaf_blks(struct gfs2_inode *ip, struct metawalk_fxns *pass) } gfs2_leaf_in(&leaf, lbh); if (pass->check_leaf) - error = pass->check_leaf(ip, leaf_no, lbh, + error = pass->check_leaf(ip, leaf_no, pass->private);
/* @@ -1475,10 +1475,9 @@ int delete_metadata(struct gfs2_inode *ip, uint64_t block, return delete_block_if_notdup(ip, block, bh, _("metadata"), private); }
-int delete_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private) +int delete_leaf(struct gfs2_inode *ip, uint64_t block, void *private) { - return delete_block_if_notdup(ip, block, &bh, _("leaf"), private); + return delete_block_if_notdup(ip, block, NULL, _("leaf"), private); }
int delete_data(struct gfs2_inode *ip, uint64_t block, void *private) @@ -1541,8 +1540,7 @@ static int alloc_data(struct gfs2_inode *ip, uint64_t block, void *private) return 0; }
-static int alloc_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private) +static int alloc_leaf(struct gfs2_inode *ip, uint64_t block, void *private) { uint8_t q;
diff --git a/gfs2/fsck/metawalk.h b/gfs2/fsck/metawalk.h index 701add2..16a6b24 100644 --- a/gfs2/fsck/metawalk.h +++ b/gfs2/fsck/metawalk.h @@ -32,8 +32,7 @@ extern int delete_block(struct gfs2_inode *ip, uint64_t block, void *private); extern int delete_metadata(struct gfs2_inode *ip, uint64_t block, struct gfs2_buffer_head **bh, int h, void *private); -extern int delete_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private); +extern int delete_leaf(struct gfs2_inode *ip, uint64_t block, void *private); extern int delete_data(struct gfs2_inode *ip, uint64_t block, void *private); extern int delete_eattr_indir(struct gfs2_inode *ip, uint64_t block, uint64_t parent, struct gfs2_buffer_head **bh, void *private); @@ -72,7 +71,7 @@ extern struct gfs2_inode *fsck_system_inode(struct gfs2_sbd *sdp, struct metawalk_fxns { void *private; int (*check_leaf) (struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private); + void *private); int (*check_metalist) (struct gfs2_inode *ip, uint64_t block, struct gfs2_buffer_head **bh, int h, void *private); diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 2c8fbcf..0de9c90 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -47,8 +47,7 @@ struct block_count { uint64_t ea_count; };
-static int leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private); +static int leaf(struct gfs2_inode *ip, uint64_t block, void *private); static int check_metalist(struct gfs2_inode *ip, uint64_t block, struct gfs2_buffer_head **bh, int h, void *private); static int undo_check_metalist(struct gfs2_inode *ip, uint64_t block, @@ -79,7 +78,7 @@ static int invalidate_metadata(struct gfs2_inode *ip, uint64_t block, struct gfs2_buffer_head **bh, int h, void *private); static int invalidate_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private); + void *private); static int invalidate_data(struct gfs2_inode *ip, uint64_t block, void *private); static int invalidate_eattr_indir(struct gfs2_inode *ip, uint64_t block, @@ -212,8 +211,7 @@ struct metawalk_fxns sysdir_fxns = { .check_dentry = resuscitate_dentry, };
-static int leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private) +static int leaf(struct gfs2_inode *ip, uint64_t block, void *private) { struct block_count *bc = (struct block_count *) private;
@@ -868,7 +866,7 @@ static int invalidate_metadata(struct gfs2_inode *ip, uint64_t block, }
static int invalidate_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private) + void *private) { return mark_block_invalid(ip, block, ref_as_meta, _("leaf")); } @@ -951,9 +949,9 @@ static int rangecheck_metadata(struct gfs2_inode *ip, uint64_t block, }
static int rangecheck_leaf(struct gfs2_inode *ip, uint64_t block, - struct gfs2_buffer_head *bh, void *private) + void *private) { - return rangecheck_block(ip, block, &bh, _("leaf"), private); + return rangecheck_block(ip, block, NULL, _("leaf"), private); }
static int rangecheck_data(struct gfs2_inode *ip, uint64_t block,