f2fs: code cleanup for f2fs_statfs_project()
authorChengguang Xu <cgxu519@mykernel.net>
Sat, 4 Jan 2020 14:20:04 +0000 (22:20 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Sat, 18 Jan 2020 00:48:43 +0000 (16:48 -0800)
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>
fs/f2fs/super.c

index 904b5fb..593dc3d 100644 (file)
@@ -1282,12 +1282,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;
 
@@ -1299,12 +1295,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;