Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1840be7e authored by Chengguang Xu's avatar Chengguang Xu Committed by Jaegeuk Kim
Browse files

f2fs: code cleanup for f2fs_statfs_project() 



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

Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c26b97c9

fs/f2fs/super.c

+4 −12
Original line number Diff line number Diff line
@@ -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;