| Message ID | 159477799136.3263162.16638446868281519003.stgit@magnolia (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfs: remove xfs_disk_quot from incore dquot | expand |
On Wednesday 15 July 2020 7:23:11 AM IST Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > 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. > The changes look good to me. Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/xfs_dquot.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index e44f80700005..2b52913073b3 100644 > --- 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, dq->q_type); > > - 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) > >
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index e44f80700005..2b52913073b3 100644 --- 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, dq->q_type); - 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)