linux-kernel - Re: [PATCH] fs/jfs: replace ternary operator with min

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:   Mon, 17 Oct 2022 15:03:15 -0500
From:   Dave Kleikamp <dave.kleikamp@...cle.com>
To:     Jiangshan Yi <13667453960@....com>
Cc:     jfs-discussion@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
        Jiangshan Yi <yijiangshan@...inos.cn>
Subject: Re: [PATCH] fs/jfs: replace ternary operator with min_t()

Catching up on old patches. Sorry this took so long. Looks good to me. 
I'll push it to mainline.

Thanks,
Shaggy

On 7/13/22 9:56PM, Jiangshan Yi wrote:
> From: Jiangshan Yi <yijiangshan@...inos.cn>
> 
> Fix the following coccicheck warning:
> 
> fs/jfs/super.c:748: WARNING opportunity for min().
> fs/jfs/super.c:788: WARNING opportunity for min().
> 
> min_t() macro is defined in include/linux/minmax.h. It avoids
> multiple evaluations of the arguments when non-constant and performs
> strict type-checking.
> 
> Signed-off-by: Jiangshan Yi <yijiangshan@...inos.cn>
> ---
>   fs/jfs/super.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/jfs/super.c b/fs/jfs/super.c
> index 85d4f44f2ac4..d2f82cb7db1b 100644
> --- a/fs/jfs/super.c
> +++ b/fs/jfs/super.c
> @@ -745,8 +745,7 @@ static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
>   		len = i_size-off;
>   	toread = len;
>   	while (toread > 0) {
> -		tocopy = sb->s_blocksize - offset < toread ?
> -				sb->s_blocksize - offset : toread;
> +		tocopy = min_t(size_t, sb->s_blocksize - offset, toread);
>   
>   		tmp_bh.b_state = 0;
>   		tmp_bh.b_size = i_blocksize(inode);
> @@ -785,8 +784,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,
>   
>   	inode_lock(inode);
>   	while (towrite > 0) {
> -		tocopy = sb->s_blocksize - offset < towrite ?
> -				sb->s_blocksize - offset : towrite;
> +		tocopy = min_t(size_t, sb->s_blocksize - offset, towrite);
>   
>   		tmp_bh.b_state = 0;
>   		tmp_bh.b_size = i_blocksize(inode);