Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=bfea7d7ff12f29... Commit: bfea7d7ff12f29441a26119a274148dcf3608723 Parent: dfbfbf58c8185246746a78e04ddbe8446ca6f1cf Author: Bob Peterson rpeterso@redhat.com AuthorDate: Mon Aug 8 16:20:14 2011 -0500 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Fri Apr 5 06:24:59 2013 -0700
fsck.gfs2: fsck.gfs2: Don't stop invalidating blocks on invalid
When fsck found a duplicate reference to a block it invalidated the dinode's metadata. But if it encountered an invalid block, for example, out of range, the invalidating would stop. If we encounter a block that isn't valid, we obviously can't invalidate it. However, if we return an error, all future invalidating will stop for that dinode. That's wrong because we need it to continue to invalidate the other valid blocks. If we don't do this, block references that follow the bad one that are also referenced elsewhere (duplicates) won't be flagged as such. As a result, they'll be freed when this corrupt dinode is deleted, despite being used by another dinode as a valid block. This patch makes it return a good return code so the invalidating continues.
rhbz#877150 --- gfs2/fsck/pass1.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 1b40c9f..9aac8fb 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -839,8 +839,15 @@ static int mark_block_invalid(struct gfs2_inode *ip, uint64_t block, { uint8_t q;
- if (!valid_block(ip->i_sbd, block) != 0) - return -EFAULT; + /* If the block isn't valid, we obviously can't invalidate it. + * However, if we return an error, invalidating will stop, and + * we want it to continue to invalidate the valid blocks. If we + * don't do this, block references that follow that are also + * referenced elsewhere (duplicates) won't be flagged as such, + * and as a result, they'll be freed when this dinode is deleted, + * despite being used by another dinode as a valid block. */ + if (!valid_block(ip->i_sbd, block)) + return 0;
q = block_type(block); if (q != gfs2_block_free) {