linux-ext4 - Re: [PATCH 1/2] ext3: init statistics after journal recovery v2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100413142621.GD3888@quack.scz.novell.com>
Date:	Tue, 13 Apr 2010 16:26:21 +0200
From:	Jan Kara <jack@...e.cz>
To:	Dmitry Monakhov <dmonakhov@...nvz.org>
Cc:	Jan Kara <jack@...e.cz>, linux-ext4@...r.kernel.org, tytso@....edu
Subject: Re: [PATCH 1/2] ext3: init statistics after journal recovery v2

On Mon 12-04-10 23:46:00, Dmitry Monakhov wrote:
> 
> Currently block/inode/dir counters initialized before journal was
> recovered. In fact after journal recovery this info will probably
> change which result in incorrect statfs()
> BUG:#15768
  Merged. Thanks.

								Honza

> 
> Signed-off-by: Dmitry Monakhov <dmonakhov@...nvz.org>
> ---
>  fs/ext3/super.c |   44 +++++++++++++++++++++-----------------------
>  1 files changed, 21 insertions(+), 23 deletions(-)
> 
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index e844acc..436e0dc 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -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 @@ cantfind_ext3:
>  		       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]);
> -- 
> 1.6.6.1
> 
-- 
Jan Kara <jack@...e.cz>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html