Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41d1a636 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Jan Kara
Browse files

ext3: init statistics after journal recovery v2 



Currently block/inode/dir counters are initialized before journal was
recovered. In fact after journal recovery this info will probably
change which results in incorrect numbers returned from statfs(2).
BUG:#15768

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 524e4a1d

fs/ext3/super.c

+21 −23
Original line number Diff line number Diff line
@@ -1890,21 +1890,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	get_random_bytes(&sbi->s_next_generation, sizeof(u32));

	spin_lock_init(&sbi->s_next_gen_lock);



	err = percpu_counter_init(&sbi->s_freeblocks_counter,

			ext3_count_free_blocks(sb));

	if (!err) {

		err = percpu_counter_init(&sbi->s_freeinodes_counter,

				ext3_count_free_inodes(sb));

	}

	if (!err) {

		err = percpu_counter_init(&sbi->s_dirs_counter,

				ext3_count_dirs(sb));

	}

	if (err) {

		ext3_msg(sb, KERN_ERR, "error: insufficient memory");

		goto failed_mount3;

	}



	/* per fileystem reservation list head & lock */

	spin_lock_init(&sbi->s_rsv_window_lock);

	sbi->s_rsv_window_root = RB_ROOT;
@@ -1945,15 +1930,29 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	if (!test_opt(sb, NOLOAD) &&

	    EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {

		if (ext3_load_journal(sb, es, journal_devnum))

			goto failed_mount3;

			goto failed_mount2;

	} else if (journal_inum) {

		if (ext3_create_journal(sb, es, journal_inum))

			goto failed_mount3;

			goto failed_mount2;

	} else {

		if (!silent)

			ext3_msg(sb, KERN_ERR,

				"error: no journal found. "

				"mounting ext3 over ext2?");

		goto failed_mount2;

	}

	err = percpu_counter_init(&sbi->s_freeblocks_counter,

			ext3_count_free_blocks(sb));

	if (!err) {

		err = percpu_counter_init(&sbi->s_freeinodes_counter,

				ext3_count_free_inodes(sb));

	}

	if (!err) {

		err = percpu_counter_init(&sbi->s_dirs_counter,

				ext3_count_dirs(sb));

	}

	if (err) {

		ext3_msg(sb, KERN_ERR, "error: insufficient memory");

		goto failed_mount3;

	}
@@ -1978,7 +1977,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
			ext3_msg(sb, KERN_ERR,

				"error: journal does not support "

				"requested data journaling mode");

			goto failed_mount4;

			goto failed_mount3;

		}

	default:

		break;
@@ -2001,19 +2000,19 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	if (IS_ERR(root)) {

		ext3_msg(sb, KERN_ERR, "error: get root inode failed");

		ret = PTR_ERR(root);

		goto failed_mount4;

		goto failed_mount3;

	}

	if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size) {

		iput(root);

		ext3_msg(sb, KERN_ERR, "error: corrupt root inode, run e2fsck");

		goto failed_mount4;

		goto failed_mount3;

	}

	sb->s_root = d_alloc_root(root);

	if (!sb->s_root) {

		ext3_msg(sb, KERN_ERR, "error: get root dentry failed");

		iput(root);

		ret = -ENOMEM;

		goto failed_mount4;

		goto failed_mount3;

	}



	ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
@@ -2039,12 +2038,11 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
		       sb->s_id);

	goto failed_mount;



failed_mount4:

	journal_destroy(sbi->s_journal);

failed_mount3:

	percpu_counter_destroy(&sbi->s_freeblocks_counter);

	percpu_counter_destroy(&sbi->s_freeinodes_counter);

	percpu_counter_destroy(&sbi->s_dirs_counter);

	journal_destroy(sbi->s_journal);

failed_mount2:

	for (i = 0; i < db_count; i++)

		brelse(sbi->s_group_desc[i]);