Commit a08fe66e authored by Chengguang Xu's avatar Chengguang Xu Committed by Theodore Ts'o
Browse files

ext4: code cleanup for ext4_statfs_project() 



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

Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Link: https://lore.kernel.org/r/20200210082445.2379-1-cgxu519@mykernel.net


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 72f9da1d

fs/ext4/super.c

+4 −9
Original line number Diff line number Diff line
@@ -5622,10 +5622,8 @@ static int ext4_statfs_project(struct super_block *sb, 
		return PTR_ERR(dquot);

	spin_lock(&dquot->dq_dqb_lock);



	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);

	limit >>= sb->s_blocksize_bits;



	if (limit && buf->f_blocks > limit) {
@@ -5637,11 +5635,8 @@ static int ext4_statfs_project(struct super_block *sb, 
			 (buf->f_blocks - curblock) : 0;

	}



	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;

		buf->f_ffree =

CRA Git | Maintained and supported by SUSTech CRA and CCSE