Commit 9888725d authored by Jiangshan Yi's avatar Jiangshan Yi Committed by Jan Kara
Browse files

fs/ext2: replace ternary operator with min_t() 

Fix the following coccicheck warning:

fs/ext2/super.c:1494: WARNING opportunity for min().
fs/ext2/super.c:1533: 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.

Link: https://lore.kernel.org/r/20220714063318.1777139-1-13667453960@163.com


Signed-off-by: default avatarJiangshan Yi <yijiangshan@kylinos.cn>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent a175eca0

fs/ext2/super.c

+2 −4
Original line number Diff line number Diff line
@@ -1490,8 +1490,7 @@ static ssize_t ext2_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 = sb->s_blocksize;
@@ -1529,8 +1528,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type, 
	struct buffer_head *bh;



	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 = sb->s_blocksize;