linux-ext4 - Re: [PATCH] ext4: include journal blocks of internal journal in df overhead calcs

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: <20140813225543.GK2808@birch.djwong.org>
Date:	Wed, 13 Aug 2014 15:55:43 -0700
From:	"Darrick J. Wong" <darrick.wong@...cle.com>
To:	Chin-Tsung Cheng <chintzung@...il.com>
Cc:	tytso@....edu, adilger.kernel@...ger.ca,
	linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ext4: include journal blocks of internal journal in df
 overhead calcs

On Wed, Aug 13, 2014 at 09:37:23PM +0800, Chin-Tsung Cheng wrote:
> The journal blocks of external journal device should not
> be counted as overhead.
> 
> Signed-off-by: Chin-Tsung Cheng <chintzung@...il.com>
> ---
>  fs/ext4/super.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 32b43ad..03b2f62 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -3316,9 +3316,10 @@ int ext4_calculate_overhead(struct super_block *sb)
>  			memset(buf, 0, PAGE_SIZE);
>  		cond_resched();
>  	}
> -	/* Add the journal blocks as well */
> -	if (sbi->s_journal)
> -		overhead += EXT4_NUM_B2C(sbi, sbi->s_journal->j_maxlen);
> +	/* Add the internal journal blocks as well */
> +	if ((sbi->s_journal) &&
> +		(sbi->s_journal->j_fs_dev == sbi->s_journal->j_dev))
> +			overhead += EXT4_NUM_B2C(sbi, sbi->s_journal->j_maxlen);

I think you have some whitespace issues here, but otherwise this seems ok.

External journals aren't counted towards the total blocks count, correct?

--D
>  
>  	sbi->s_overhead = overhead;
>  	smp_wmb();
> -- 
> 1.9.3
> 
> --
> 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
--
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