diff options
author | Benjamin Marzinski <bmarzins@redhat.com> | 2009-07-10 18:13:26 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-07-30 11:00:28 +0100 |
commit | 6b94617024bd6810cde1d0d491202c30d5a38d91 (patch) | |
tree | 0c43470d42191b3b445a41add6d01ce84e482290 /fs/gfs2/rgrp.c | |
parent | 8ff22a6f9bdaac87c0eeb1d56c736181f11b4221 (diff) | |
download | kernel_samsung_smdk4412-6b94617024bd6810cde1d0d491202c30d5a38d91.zip kernel_samsung_smdk4412-6b94617024bd6810cde1d0d491202c30d5a38d91.tar.gz kernel_samsung_smdk4412-6b94617024bd6810cde1d0d491202c30d5a38d91.tar.bz2 |
GFS2: Fix incorrent statfs consistency check
Since both linked and unlinked inodes are counted by rgd->rd_dinodes, It
makes no sense to count them with the used data blocks (first check that
I changed), it makes sense to count them with the linked inodes (second
check), and it makes no sense to care if there are more unlinked inodes
than linked ones. This fixes these errors.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r-- | fs/gfs2/rgrp.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 5e50741..fba7957 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -285,27 +285,19 @@ void gfs2_rgrp_verify(struct gfs2_rgrpd *rgd) } tmp = rgd->rd_data - rgd->rd_free - rgd->rd_dinodes; - if (count[1] + count[2] != tmp) { + if (count[1] != tmp) { if (gfs2_consist_rgrpd(rgd)) fs_err(sdp, "used data mismatch: %u != %u\n", count[1], tmp); return; } - if (count[3] != rgd->rd_dinodes) { + if (count[2] + count[3] != rgd->rd_dinodes) { if (gfs2_consist_rgrpd(rgd)) fs_err(sdp, "used metadata mismatch: %u != %u\n", - count[3], rgd->rd_dinodes); + count[2] + count[3], rgd->rd_dinodes); return; } - - if (count[2] > count[3]) { - if (gfs2_consist_rgrpd(rgd)) - fs_err(sdp, "unlinked inodes > inodes: %u\n", - count[2]); - return; - } - } static inline int rgrp_contains_block(struct gfs2_rgrpd *rgd, u64 block) |