aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2010-08-15 20:16:11 +0900
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2010-08-16 11:08:36 +0900
commitea1a16f7168ac19d974ac51b47593b92280e7992 (patch)
treee16e89f6f8f3a440476bba74a1c28d2f5bc0f5f4 /fs
parentaf4e36318edb848fcc0a8d5f75000ca00cdc7595 (diff)
downloadmrst-s0i3-test-ea1a16f7168ac19d974ac51b47593b92280e7992.tar.gz
mrst-s0i3-test-ea1a16f7168ac19d974ac51b47593b92280e7992.tar.xz
mrst-s0i3-test-ea1a16f7168ac19d974ac51b47593b92280e7992.zip
nilfs2: fix false warning saying one of two super blocks is broken
After applying commit b2ac86e1, the following message got appeared after unclean shutdown: > NILFS warning: broken superblock. using spare superblock. This turns out to be a false message due to the change which updates two super blocks alternately. The secondary super block now can be selected if it's newer than the primary one. This kills the false warning by suppressing it if another super block is not actually broken. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/the_nilfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 37de1f062d8..6af1c0073e9 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -608,11 +608,11 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,
return -EINVAL;
}
- if (swp) {
+ if (!valid[!swp])
printk(KERN_WARNING "NILFS warning: broken superblock. "
"using spare superblock.\n");
+ if (swp)
nilfs_swap_super_block(nilfs);
- }
nilfs->ns_sbwcount = 0;
nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime);