Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff... Commit: 07cadb6dbca0618635b25fd9ff9f03118bfe2f90 Parent: f4ddd034d629e628a2cde4aba86d0c7c20e9800a Author: Bob Peterson rpeterso@redhat.com AuthorDate: Mon Aug 8 16:44:47 2011 -0500 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Mon Aug 29 12:53:02 2011 -0500
fsck.gfs2: fsck.gfs2: Find and clear duplicate leaf blocks refs
Duplicate references that were in leaf blocks were never found nor cleared. This patch adds that capability.
rhbz#675723 --- gfs2/fsck/pass1b.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index 9497c78..7c6ae3d 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -28,6 +28,7 @@ struct dup_handler { int ref_count; };
+static int check_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 check_data(struct gfs2_inode *ip, uint64_t block, void *private); @@ -53,7 +54,7 @@ static int find_dentry(struct gfs2_inode *ip, struct gfs2_dirent *de,
struct metawalk_fxns find_refs = { .private = NULL, - .check_leaf = NULL, + .check_leaf = check_leaf, .check_metalist = check_metalist, .check_data = check_data, .check_eattr_indir = check_eattr_indir, @@ -75,6 +76,11 @@ struct metawalk_fxns find_dirents = { .check_eattr_extentry = NULL, };
+static int check_leaf(struct gfs2_inode *ip, uint64_t block, void *private) +{ + return add_duplicate_ref(ip, block, ref_as_meta, 1, INODE_VALID); +} + static int check_metalist(struct gfs2_inode *ip, uint64_t block, struct gfs2_buffer_head **bh, int h, void *private) { @@ -253,6 +259,11 @@ static int clear_dup_data(struct gfs2_inode *ip, uint64_t block, void *private) return clear_dup_metalist(ip, block, NULL, 0, private); }
+static int clear_leaf(struct gfs2_inode *ip, uint64_t block, void *private) +{ + return clear_dup_metalist(ip, block, NULL, 0, private); +} + static int clear_dup_eattr_indir(struct gfs2_inode *ip, uint64_t block, uint64_t parent, struct gfs2_buffer_head **bh, void *private) @@ -395,7 +406,7 @@ static int clear_a_reference(struct gfs2_sbd *sdp, struct duptree *b, osi_list_t *tmp, *x; struct metawalk_fxns clear_dup_fxns = { .private = NULL, - .check_leaf = NULL, + .check_leaf = clear_leaf, .check_metalist = clear_dup_metalist, .check_data = clear_dup_data, .check_eattr_indir = clear_dup_eattr_indir,
cluster-commits@lists.fedorahosted.org