On 3/17/20 4:59 AM, xiakaixu1987@xxxxxxxxx wrote:
> 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>
I think that you are correct that as long as we can never have
soft > hard, this is equivalent logic.
However, I had to think pretty hard to convince myself that this is
true, and the current code is obvious and easy to understand.
Others might have a different idea, but I'm not sure this change is an
improvement.
I think of Brian Kernighan, "...if you write the code as cleverly as possible,
you are, by definition, not smart enough to debug it." ;)
> ---
> 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 =
>
