mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

f2fs: code cleanup for f2fs_statfs_project()

Browse source 
Calling min_not_zero() to simplify complicated prjquota
limit comparison in f2fs_statfs_project().

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chengguang Xu 2020-01-04 22:20:04 +08:00 committed by Jaegeuk Kim
parent acdf217217
commit bf2cbd3c57
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/f2fs/super.c
View file

@ -1282,12 +1282,8 @@ static int f2fs_statfs_project(struct super_block *sb,
return PTR_ERR(dquot); return PTR_ERR(dquot);
spin_lock(&dquot->dq_dqb_lock); spin_lock(&dquot->dq_dqb_lock);
limit = 0; limit = min_not_zero(dquot->dq_dqb.dqb_bsoftlimit,
if (dquot->dq_dqb.dqb_bsoftlimit) dquot->dq_dqb.dqb_bhardlimit);
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;
if (limit) if (limit)
limit >>= sb->s_blocksize_bits; limit >>= sb->s_blocksize_bits;
@ -1299,12 +1295,8 @@ static int f2fs_statfs_project(struct super_block *sb,
(buf->f_blocks - curblock) : 0; (buf->f_blocks - curblock) : 0;
} }
limit = 0; limit = min_not_zero(dquot->dq_dqb.dqb_isoftlimit,
if (dquot->dq_dqb.dqb_isoftlimit) dquot->dq_dqb.dqb_ihardlimit);
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;
if (limit && buf->f_files > limit) { if (limit && buf->f_files > limit) {
buf->f_files = limit; buf->f_files = limit;