[Cluster-devel] [PATCH 20/42] fsck.gfs2: Remove redundant leaf depth check
rpeterso at redhat.com
rpeterso at redhat.com
Mon Apr 8 14:40:52 UTC 2013
From: Bob Peterson <rpeterso at redhat.com>
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 file changed, 16 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 5137559..04e5289 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -1021,7 +1021,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;
@@ -1069,21 +1068,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;
--
1.7.11.7
More information about the Cluster-devel
mailing list