linux-ext4 - Re: [PATCH v2] ext3: Adjust trim start with first_data

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] [day] [month] [year] [list]

Date:	Fri, 21 Jan 2011 16:00:01 +0100
From:	Jan Kara <jack@...e.cz>
To:	Tao Ma <tm@....ma>
Cc:	linux-ext4@...r.kernel.org, Jan Kara <jack@...e.cz>,
	Lukas Czerner <lczerner@...hat.com>
Subject: Re: [PATCH v2] ext3: Adjust trim start with first_data_block.

On Fri 21-01-11 10:52:56, Tao Ma wrote:
> From: Tao Ma <boyu.mt@...bao.com>
> 
> As we have make the consense in the e-mail[1], the trim start should
> be added with first_data_block. So this patch fulfill it and remove
> the check for start < first_data_block.
> 
> [1] http://www.spinics.net/lists/linux-ext4/msg22737.html
  Thanks. Merged.

								Honza
> 
> Cc: Jan Kara <jack@...e.cz>
> Cc: Lukas Czerner <lczerner@...hat.com>
> Signed-off-by: Tao Ma <boyu.mt@...bao.com>
> ---
>  fs/ext3/balloc.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
> index 971e1bd..13bfebe 100644
> --- a/fs/ext3/balloc.c
> +++ b/fs/ext3/balloc.c
> @@ -2091,7 +2091,8 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
>  	ext3_fsblk_t max_blks = le32_to_cpu(es->s_blocks_count);
>  	int ret = 0;
>  
> -	start = range->start >> sb->s_blocksize_bits;
> +	start = (range->start >> sb->s_blocksize_bits) +
> +		le32_to_cpu(es->s_first_data_block);
>  	len = range->len >> sb->s_blocksize_bits;
>  	minlen = range->minlen >> sb->s_blocksize_bits;
>  	trimmed = 0;
> @@ -2100,10 +2101,6 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
>  		return -EINVAL;
>  	if (start >= max_blks)
>  		goto out;
> -	if (start < le32_to_cpu(es->s_first_data_block)) {
> -		len -= le32_to_cpu(es->s_first_data_block) - start;
> -		start = le32_to_cpu(es->s_first_data_block);
> -	}
>  	if (start + len > max_blks)
>  		len = max_blks - start;
>  
> -- 
> 1.6.3.GIT
> 
-- 
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