Commit 70b54376 authored by Mitsuo Hayasaka's avatar Mitsuo Hayasaka Committed by Ben Myers
Browse files

xfs: cleanup quota check on disk blocks and inodes reservations 



This patch is a cleanup of quota check on disk blocks and inodes
reservations, and changes it as follows.

(1) add a total_count variable to store the total number of
    current usages and new reservations for disk blocks and inodes,
    respectively.

(2) make it more readable to check if the local variables softlimit
    and hardlimit are positive. It has been changed as follows.
	    if (softlimit > 0ULL) -> if (softlimit)
	    if (hardlimit > 0ULL) -> if (hardlimit)
    This is because they are defined as xfs_qcnt_t which is unsigned.

Signed-off-by: default avatarMitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: Ben Myers <bpm@sgi.com>
Cc: Alex Elder <elder@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 33e0edaf

fs/xfs/xfs_trans_dquot.c

+7 −10
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ xfs_trans_dqresv( 
	time_t		timer;

	xfs_qwarncnt_t	warns;

	xfs_qwarncnt_t	warnlimit;

	xfs_qcnt_t	count;

	xfs_qcnt_t	total_count;

	xfs_qcnt_t	*resbcountp;

	xfs_quotainfo_t	*q = mp->m_quotainfo;
@@ -648,13 +648,12 @@ xfs_trans_dqresv( 
			 * hardlimit or exceed the timelimit if we allocate

			 * nblks.

			 */

			if (hardlimit > 0ULL &&

			    hardlimit < nblks + *resbcountp) {

			total_count = *resbcountp + nblks;

			if (hardlimit && total_count > hardlimit) {

				xfs_quota_warn(mp, dqp, QUOTA_NL_BHARDWARN);

				goto error_return;

			}

			if (softlimit > 0ULL &&

			    softlimit < nblks + *resbcountp) {

			if (softlimit && total_count > softlimit) {

				if ((timer != 0 && get_seconds() > timer) ||

				    (warns != 0 && warns >= warnlimit)) {

					xfs_quota_warn(mp, dqp,
@@ -666,7 +665,7 @@ xfs_trans_dqresv( 
			}

		}

		if (ninos > 0) {

			count = be64_to_cpu(dqp->q_core.d_icount);

			total_count = be64_to_cpu(dqp->q_core.d_icount) + ninos;

			timer = be32_to_cpu(dqp->q_core.d_itimer);

			warns = be16_to_cpu(dqp->q_core.d_iwarns);

			warnlimit = dqp->q_mount->m_quotainfo->qi_iwarnlimit;
@@ -677,13 +676,11 @@ xfs_trans_dqresv( 
			if (!softlimit)

				softlimit = q->qi_isoftlimit;



			if (hardlimit > 0ULL &&

			    hardlimit < ninos + count) {

			if (hardlimit && total_count > hardlimit) {

				xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN);

				goto error_return;

			}

			if (softlimit > 0ULL &&

			    softlimit < ninos + count) {

			if (softlimit && total_count > softlimit) {

				if  ((timer != 0 && get_seconds() > timer) ||

				     (warns != 0 && warns >= warnlimit)) {

					xfs_quota_warn(mp, dqp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE