| From bf2cbd3c57159c2b639ee8797b52ab5af180bf83 Mon Sep 17 00:00:00 2001 |
| From: Chengguang Xu <cgxu519@mykernel.net> |
| Date: Sat, 4 Jan 2020 22:20:04 +0800 |
| Subject: f2fs: code cleanup for f2fs_statfs_project() |
| |
| From: Chengguang Xu <cgxu519@mykernel.net> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/f2fs/super.c | 16 ++++------------ |
| 1 file changed, 4 insertions(+), 12 deletions(-) |
| |
| --- a/fs/f2fs/super.c |
| +++ b/fs/f2fs/super.c |
| @@ -1148,12 +1148,8 @@ static int f2fs_statfs_project(struct su |
| 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; |
| |
| @@ -1165,12 +1161,8 @@ static int f2fs_statfs_project(struct su |
| (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; |
