Skip to content

Commit 46d3688

Browse files
jankaratytso
authored andcommitted
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/[email protected] Reported-by: Coverity <[email protected]> Signed-off-by: Jan Kara <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Cc: [email protected]
1 parent 14c9ca0 commit 46d3688

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/ext4/super.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5585,10 +5585,7 @@ static int ext4_statfs_project(struct super_block *sb,
55855585
return PTR_ERR(dquot);
55865586
spin_lock(&dquot->dq_dqb_lock);
55875587

5588-
limit = 0;
5589-
if (dquot->dq_dqb.dqb_bsoftlimit &&
5590-
(!limit || dquot->dq_dqb.dqb_bsoftlimit < limit))
5591-
limit = dquot->dq_dqb.dqb_bsoftlimit;
5588+
limit = dquot->dq_dqb.dqb_bsoftlimit;
55925589
if (dquot->dq_dqb.dqb_bhardlimit &&
55935590
(!limit || dquot->dq_dqb.dqb_bhardlimit < limit))
55945591
limit = dquot->dq_dqb.dqb_bhardlimit;
@@ -5603,10 +5600,7 @@ static int ext4_statfs_project(struct super_block *sb,
56035600
(buf->f_blocks - curblock) : 0;
56045601
}
56055602

5606-
limit = 0;
5607-
if (dquot->dq_dqb.dqb_isoftlimit &&
5608-
(!limit || dquot->dq_dqb.dqb_isoftlimit < limit))
5609-
limit = dquot->dq_dqb.dqb_isoftlimit;
5603+
limit = dquot->dq_dqb.dqb_isoftlimit;
56105604
if (dquot->dq_dqb.dqb_ihardlimit &&
56115605
(!limit || dquot->dq_dqb.dqb_ihardlimit < limit))
56125606
limit = dquot->dq_dqb.dqb_ihardlimit;

0 commit comments

Comments
 (0)