| From 960aee0b3b5e7e4e405ddc35bd196055287af17e Mon Sep 17 00:00:00 2001 |
| From: Chengguang Xu <cgxu519@mykernel.net> |
| Date: Sat, 4 Jan 2020 22:20:04 +0800 |
| Subject: [PATCH] f2fs: code cleanup for f2fs_statfs_project() |
| |
| commit bf2cbd3c57159c2b639ee8797b52ab5af180bf83 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c |
| index a76b24f551fb..715b8b2161dd 100644 |
| --- a/fs/f2fs/super.c |
| +++ b/fs/f2fs/super.c |
| @@ -1191,12 +1191,8 @@ static int f2fs_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; |
| - 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); |
| if (limit) |
| limit >>= sb->s_blocksize_bits; |
| |
| @@ -1208,12 +1204,8 @@ static int f2fs_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; |
| - 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; |
| -- |
| 2.7.4 |
| |
