ext4: code cleanup for ext4_statfs_project()
PATCH 1/1 ext4: code cleanup for ext4_statfs_project()
Calling min_not_zero() to simplify complicated prjquota limit comparison in ext4_statfs_project().
Signed-off-by Chengguang Xu <[email protected]>
--- fs/ext4/super.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
fs/ext4/super.c +4 -15
@@ -5585,13 +5585,8 @@ 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)) - limit = dquot->dq_dqb.dqb_bhardlimit; + limit =min_not_zero (dquot->dq_dqb.dqb_bsoftlimit, + dquot->dq_dqb.dqb_bhardlimit); limit >>= sb->s_blocksize_bits;if (limit && buf->f_blocks > limit) {
@@ -5603,14 +5598,8 @@ 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)) - limit = dquot->dq_dqb.dqb_ihardlimit; - + limit =min_not_zero (dquot->dq_dqb.dqb_isoftlimit, + dquot->dq_dqb.dqb_ihardlimit);if (limit && buf->f_files > limit) { buf->f_files = limit; buf->f_ffree =
Signature · 1 line
2.21.1
Quoted 4 lines · Chengguang Xu
Calling
min_not_zero()to simplify complicated prjquota limit comparison inext4_statfs_project().Signed-off-by Chengguang Xu <[email protected]>
Thanks, applied.
- Ted