This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
gfs2-utils: master - Removed check for incorrect height
- From: Bob Peterson <rpeterso at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 10 Jun 2009 03:40:56 +0000 (UTC)
- Subject: gfs2-utils: master - Removed check for incorrect height
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=9bc8ca01cbbb5c4a013e153e34752e55d11dc7ed
Commit: 9bc8ca01cbbb5c4a013e153e34752e55d11dc7ed
Parent: 7e624dfed376ba265b214b699144a9d8ef081751
Author: Bob Peterson <rpeterso@redhat.com>
AuthorDate: Tue Jun 9 22:32:09 2009 -0500
Committer: Bob Peterson <rpeterso@redhat.com>
CommitterDate: Tue Jun 9 22:32:09 2009 -0500
Removed check for incorrect height
bz 503083 - GFS2: Dinode #33129 (0x8169) has bad height
Found 1, Expected >= 2
Basically, commit 9b8c81d1 allowed gfs2 to have dinode
sizes (via truncate, etc.) that are bigger than the
metadata tree would suggest. Therefore, the check for
an invalid height size needed to be removed from pass1.
---
gfs2/fsck/pass1.c | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index f056fc8..d3cf70c 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -699,27 +699,6 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh,
return -1;
}
- /* FIXME: fix height and depth here - wasn't implemented in
- * old fsck either, so no biggy... */
- if (ip->i_di.di_height < compute_height(sdp, ip->i_di.di_size)){
- log_warn( _("Dinode #%llu (0x%llx) has bad height "
- "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_height,
- compute_height(sdp, ip->i_di.di_size));
- /* once implemented, remove continue statement */
- log_warn( _("Marking inode invalid\n"));
- if(gfs2_block_set(sdp, bl, block, gfs2_meta_inval)) {
- stack;
- fsck_inode_put(ip, f);
- return -1;
- }
- gfs2_set_bitmap(sdp, block, GFS2_BLKST_FREE);
- fsck_inode_put(ip, f);
- return 0;
- }
-
if (S_ISDIR(ip->i_di.di_mode) &&
(ip->i_di.di_flags & GFS2_DIF_EXHASH)) {
if (((1 << ip->i_di.di_depth) * sizeof(uint64_t)) != ip->i_di.di_size){