Commit ea1a16f7 authored Aug 15, 2010 by Ryusuke Konishi

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>

parent af4e3631

fs/nilfs2/the_nilfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message