[PATCH] fs/reiserfs: replace ternary operator with min() and min_t()

[PATCH] fs/reiserfs: replace ternary operator with min() and min_t()

[Jiangshan Yi]

From: Jiangshan Yi <yijiangshan@kylinos.cn>

Fix the following coccicheck warning:

fs/reiserfs/prints.c:459: WARNING opportunity for min().
fs/reiserfs/resize.c:100: WARNING opportunity for min().
fs/reiserfs/super.c:2508: WARNING opportunity for min().
fs/reiserfs/super.c:2557: WARNING opportunity for min().

min() and 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@kylinos.cn>
---
 fs/reiserfs/prints.c | 2 +-
 fs/reiserfs/resize.c | 2 +-
 fs/reiserfs/super.c  | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 30319dc33c18..84a194b77f19 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -456,7 +456,7 @@ static int print_internal(struct buffer_head *bh, int first, int last)
 		to = B_NR_ITEMS(bh);
 	} else {
 		from = first;
-		to = last < B_NR_ITEMS(bh) ? last : B_NR_ITEMS(bh);
+		to = min_t(int, last, B_NR_ITEMS(bh));
 	}
 
 	reiserfs_printk("INTERNAL NODE (%ld) contains %z\n", bh->b_blocknr, bh);
diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index 8096c74c38ac..7b498a0d060b 100644
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -97,7 +97,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
 		 * using the copy_size var below allows this code to work for
 		 * both shrinking and expanding the FS.
 		 */
-		copy_size = bmap_nr_new < bmap_nr ? bmap_nr_new : bmap_nr;
+		copy_size = min(bmap_nr_new, bmap_nr);
 		copy_size =
 		    copy_size * sizeof(struct reiserfs_list_bitmap_node *);
 		for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) {
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index c88cd2ce0665..da1e72494e30 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2504,9 +2504,7 @@ static ssize_t reiserfs_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(unsigned long, sb->s_blocksize - offset, toread);
 		tmp_bh.b_state = 0;
 		/*
 		 * Quota files are without tails so we can safely
@@ -2554,8 +2552,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
 		return -EIO;
 	}
 	while (towrite > 0) {
-		tocopy = sb->s_blocksize - offset < towrite ?
-		    sb->s_blocksize - offset : towrite;
+		tocopy = min_t(unsigned long, sb->s_blocksize - offset, towrite);
 		tmp_bh.b_state = 0;
 		reiserfs_write_lock(sb);
 		err = reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE);
-- 
2.25.1


No virus found
		Checked by Hillstone Network AntiVirus

Re: [PATCH] fs/reiserfs: replace ternary operator with min() and min_t()

[Jan Kara]

On Fri 19-08-22 15:52:40, Jiangshan Yi wrote:
> From: Jiangshan Yi <yijiangshan@kylinos.cn>
> 
> Fix the following coccicheck warning:
> 
> fs/reiserfs/prints.c:459: WARNING opportunity for min().
> fs/reiserfs/resize.c:100: WARNING opportunity for min().
> fs/reiserfs/super.c:2508: WARNING opportunity for min().
> fs/reiserfs/super.c:2557: WARNING opportunity for min().
> 
> min() and 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@kylinos.cn>

Thanks for the cleanup. I've added the patch to my tree.

								Honza

> ---
>  fs/reiserfs/prints.c | 2 +-
>  fs/reiserfs/resize.c | 2 +-
>  fs/reiserfs/super.c  | 7 ++-----
>  3 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
> index 30319dc33c18..84a194b77f19 100644
> --- a/fs/reiserfs/prints.c
> +++ b/fs/reiserfs/prints.c
> @@ -456,7 +456,7 @@ static int print_internal(struct buffer_head *bh, int first, int last)
>  		to = B_NR_ITEMS(bh);
>  	} else {
>  		from = first;
> -		to = last < B_NR_ITEMS(bh) ? last : B_NR_ITEMS(bh);
> +		to = min_t(int, last, B_NR_ITEMS(bh));
>  	}
>  
>  	reiserfs_printk("INTERNAL NODE (%ld) contains %z\n", bh->b_blocknr, bh);
> diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
> index 8096c74c38ac..7b498a0d060b 100644
> --- a/fs/reiserfs/resize.c
> +++ b/fs/reiserfs/resize.c
> @@ -97,7 +97,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
>  		 * using the copy_size var below allows this code to work for
>  		 * both shrinking and expanding the FS.
>  		 */
> -		copy_size = bmap_nr_new < bmap_nr ? bmap_nr_new : bmap_nr;
> +		copy_size = min(bmap_nr_new, bmap_nr);
>  		copy_size =
>  		    copy_size * sizeof(struct reiserfs_list_bitmap_node *);
>  		for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) {
> diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
> index c88cd2ce0665..da1e72494e30 100644
> --- a/fs/reiserfs/super.c
> +++ b/fs/reiserfs/super.c
> @@ -2504,9 +2504,7 @@ static ssize_t reiserfs_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(unsigned long, sb->s_blocksize - offset, toread);
>  		tmp_bh.b_state = 0;
>  		/*
>  		 * Quota files are without tails so we can safely
> @@ -2554,8 +2552,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
>  		return -EIO;
>  	}
>  	while (towrite > 0) {
> -		tocopy = sb->s_blocksize - offset < towrite ?
> -		    sb->s_blocksize - offset : towrite;
> +		tocopy = min_t(unsigned long, sb->s_blocksize - offset, towrite);
>  		tmp_bh.b_state = 0;
>  		reiserfs_write_lock(sb);
>  		err = reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE);
> -- 
> 2.25.1
> 
> 
> No virus found
> 		Checked by Hillstone Network AntiVirus
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR