Commit 46d36880 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: simplify checking quota limits in ext4_statfs()

Coverity reports that conditions checking quota limits in ext4_statfs()
contain dead code. Indeed it is right and current conditions can be
simplified.

Link: https://lore.kernel.org/r/20200130111148.10766-1-jack@suse.cz


Reported-by: default avatarCoverity <scan-admin@coverity.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
parent 14c9ca05
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -5585,9 +5585,6 @@ static int ext4_statfs_project(struct super_block *sb,
		return PTR_ERR(dquot);
	spin_lock(&dquot->dq_dqb_lock);

	limit = 0;
	if (dquot->dq_dqb.dqb_bsoftlimit &&
	    (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit))
	limit = dquot->dq_dqb.dqb_bsoftlimit;
	if (dquot->dq_dqb.dqb_bhardlimit &&
	    (!limit || dquot->dq_dqb.dqb_bhardlimit < limit))
@@ -5603,9 +5600,6 @@ static int ext4_statfs_project(struct super_block *sb,
			 (buf->f_blocks - curblock) : 0;
	}

	limit = 0;
	if (dquot->dq_dqb.dqb_isoftlimit &&
	    (!limit || dquot->dq_dqb.dqb_isoftlimit < limit))
	limit = dquot->dq_dqb.dqb_isoftlimit;
	if (dquot->dq_dqb.dqb_ihardlimit &&
	    (!limit || dquot->dq_dqb.dqb_ihardlimit < limit))