Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=7467be5dc58d4b... Commit: 7467be5dc58d4b71281666f365fd01fde91e87fd Parent: c63b6da44b40a40d646ab546ae5b107894fb6043 Author: Bob Peterson rpeterso@redhat.com AuthorDate: Fri Mar 8 10:16:14 2013 -0700 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Fri May 17 15:16:45 2013 -0500
fsck.gfs2: Remove redundant leaf depth check
A previous patch changed the way we check leaf block depth. This patch removes the redundant check from pass1.
rhbz#902920 --- gfs2/fsck/pass1.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 95138fe..6f9a953 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -1020,7 +1020,6 @@ static int handle_ip(struct gfs2_sbd *sdp, struct gfs2_inode *ip) int error; struct block_count bc = {0}; long bad_pointers; - uint64_t block = ip->i_bh->b_blocknr; uint64_t lf_blks = 0;
bad_pointers = 0L; @@ -1068,21 +1067,6 @@ static int handle_ip(struct gfs2_sbd *sdp, struct gfs2_inode *ip) if (set_di_nlink(ip)) goto bad_dinode;
- if (is_dir(&ip->i_di, sdp->gfs1) && (ip->i_di.di_flags & GFS2_DIF_EXHASH)) { - if (((1 << ip->i_di.di_depth) * sizeof(uint64_t)) != ip->i_di.di_size){ - log_warn( _("Directory dinode block #%llu (0x%llx" - ") has bad depth. Found %u, Expected %u\n"), - (unsigned long long)ip->i_di.di_num.no_addr, - (unsigned long long)ip->i_di.di_num.no_addr, - ip->i_di.di_depth, - (1 >> (ip->i_di.di_size/sizeof(uint64_t)))); - if (fsck_blockmap_set(ip, block, _("bad depth"), - gfs2_block_free)) - goto bad_dinode; - return 0; - } - } - if (lf_dip) lf_blks = lf_dip->i_di.di_blocks;
cluster-commits@lists.fedorahosted.org