linux-ext4 - Re: [PATCH 3/3] fs/ext2/inode: Optimize the condition for iomap

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]

Message-ID: <20180702075727.3s7yymczrmm4xiox@quack2.suse.cz>
Date:   Mon, 2 Jul 2018 09:57:27 +0200
From:   Jan Kara <jack@...e.cz>
To:     Huaisheng Ye <yehs2007@...o.com>
Cc:     dan.j.williams@...el.com, dave.jiang@...el.com,
        willy@...radead.org, ross.zwisler@...ux.intel.com,
        vishal.l.verma@...el.com, jack@...e.com, chengnt@...ovo.com,
        linux-nvdimm@...ts.01.org, linux-kernel@...r.kernel.org,
        linux-ext4@...r.kernel.org, Huaisheng Ye <yehs1@...ovo.com>
Subject: Re: [PATCH 3/3] fs/ext2/inode: Optimize the condition for iomap_begin

On Sun 01-07-18 14:18:48, Huaisheng Ye wrote:
> From: Huaisheng Ye <yehs1@...ovo.com>
> 
> If ext2_get_blocks returns negative result, ext2_iomap_begin
> will return for error case.
> Adjust the judging condition of ret value will be useful for
> code simplification.
> 
> Signed-off-by: Huaisheng Ye <yehs1@...ovo.com>

I'm sorry but how exactly is this simpler?

								Honza

> ---
>  fs/ext2/inode.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
> index ca211bd..9b1004d 100644
> --- a/fs/ext2/inode.c
> +++ b/fs/ext2/inode.c
> @@ -819,15 +819,15 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
>  	iomap->offset = (loff_t)first_block << blkbits;
>  	iomap->dax_dev = sbi->s_daxdev;
>  
> -	if (ret == 0) {
> -		iomap->type = IOMAP_HOLE;
> -		iomap->addr = IOMAP_NULL_ADDR;
> -		iomap->length = 1 << blkbits;
> -	} else {
> +	if (ret) {
>  		iomap->type = IOMAP_MAPPED;
>  		iomap->addr = (u64)bno << blkbits;
>  		iomap->length = (u64)ret << blkbits;
>  		iomap->flags |= IOMAP_F_MERGED;
> +	} else {
> +		iomap->type = IOMAP_HOLE;
> +		iomap->addr = IOMAP_NULL_ADDR;
> +		iomap->length = 1 << blkbits;
>  	}
>  
>  	if (new)
> -- 
> 1.8.3.1
> 
> 
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR