xfs: assume the default quota limits are always set in xfs_qm_adjust_dqlimits

We always initialize the default quota limits to something nowadays, so
we don't need to check that the defaults are set to something before
using them.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 98cb31f28aaf07d8280af4dc029eb99d1a052525..8e84623cc331709a96dc24fb08e5fb6433c6b79d 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -77,21 +77,21 @@ xfs_qm_adjust_dqlimits(
        ASSERT(dq->q_id);
        defq = xfs_get_defquota(q, xfs_dquot_type(dq));
 
-       if (defq->blk.soft && !dq->q_blk.softlimit) {
+       if (!dq->q_blk.softlimit) {
                dq->q_blk.softlimit = defq->blk.soft;
                prealloc = 1;
        }
-       if (defq->blk.hard && !dq->q_blk.hardlimit) {
+       if (!dq->q_blk.hardlimit) {
                dq->q_blk.hardlimit = defq->blk.hard;
                prealloc = 1;
        }
-       if (defq->ino.soft && !dq->q_ino.softlimit)
+       if (!dq->q_ino.softlimit)
                dq->q_ino.softlimit = defq->ino.soft;
-       if (defq->ino.hard && !dq->q_ino.hardlimit)
+       if (!dq->q_ino.hardlimit)
                dq->q_ino.hardlimit = defq->ino.hard;
-       if (defq->rtb.soft && !dq->q_rtb.softlimit)
+       if (!dq->q_rtb.softlimit)
                dq->q_rtb.softlimit = defq->rtb.soft;
-       if (defq->rtb.hard && !dq->q_rtb.hardlimit)
+       if (!dq->q_rtb.hardlimit)
                dq->q_rtb.hardlimit = defq->rtb.hard;
 
        if (prealloc)