From: Kaixu Xia <kaixuxia@xxxxxxxxxxx>
It is more suitable to use min_not_zero() to get the quota limit
value, means to choose the minimum value not the softlimit firstly.
And the meaning is more clear even though the hardlimit value must
be larger than softlimit value.
Signed-off-by: Kaixu Xia <kaixuxia@xxxxxxxxxxx>
---
fs/xfs/xfs_qm_bhv.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
index fc2fa41..f1711f5 100644
--- a/fs/xfs/xfs_qm_bhv.c
+++ b/fs/xfs/xfs_qm_bhv.c
@@ -23,9 +23,8 @@
{
uint64_t limit;
- limit = dqp->q_core.d_blk_softlimit ?
- be64_to_cpu(dqp->q_core.d_blk_softlimit) :
- be64_to_cpu(dqp->q_core.d_blk_hardlimit);
+ limit = min_not_zero(be64_to_cpu(dqp->q_core.d_blk_softlimit),
+ be64_to_cpu(dqp->q_core.d_blk_hardlimit));
if (limit && statp->f_blocks > limit) {
statp->f_blocks = limit;
statp->f_bfree = statp->f_bavail =
@@ -33,9 +32,8 @@
(statp->f_blocks - dqp->q_res_bcount) : 0;
}
- limit = dqp->q_core.d_ino_softlimit ?
- be64_to_cpu(dqp->q_core.d_ino_softlimit) :
- be64_to_cpu(dqp->q_core.d_ino_hardlimit);
+ limit = min_not_zero(be64_to_cpu(dqp->q_core.d_ino_softlimit),
+ be64_to_cpu(dqp->q_core.d_ino_hardlimit));
if (limit && statp->f_files > limit) {
statp->f_files = limit;
statp->f_ffree =
--
1.8.3.1
