Commit 2e06df55 authored by Catherine Hoang's avatar Catherine Hoang Committed by Dave Chinner
Browse files

xfs: remove warning counters from struct xfs_dquot_res 



Warning counts are not used anywhere in the kernel. In addition, there
are no use cases, test coverage, or documentation for this functionality.
Remove the 'warnings' field from struct xfs_dquot_res and any other
related code.

Signed-off-by: default avatarCatherine Hoang <catherine.hoang@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 5cc21e52

fs/xfs/libxfs/xfs_quota_defs.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * and quota-limits. This is a waste in the common case, but hey ...

 */

typedef uint64_t	xfs_qcnt_t;

typedef uint16_t	xfs_qwarncnt_t;



typedef uint8_t		xfs_dqtype_t;

fs/xfs/xfs_dquot.c

+4 −11
Original line number Diff line number Diff line
@@ -136,9 +136,6 @@ xfs_qm_adjust_res_timer( 
			res->timer = xfs_dquot_set_timeout(mp,

					ktime_get_real_seconds() + qlim->time);

	} else {

		if (res->timer == 0)

			res->warnings = 0;

		else

		res->timer = 0;

	}

}
@@ -592,10 +589,6 @@ xfs_dquot_from_disk( 
	dqp->q_ino.count = be64_to_cpu(ddqp->d_icount);

	dqp->q_rtb.count = be64_to_cpu(ddqp->d_rtbcount);



	dqp->q_blk.warnings = be16_to_cpu(ddqp->d_bwarns);

	dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns);

	dqp->q_rtb.warnings = be16_to_cpu(ddqp->d_rtbwarns);



	dqp->q_blk.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_btimer);

	dqp->q_ino.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_itimer);

	dqp->q_rtb.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_rtbtimer);
@@ -637,9 +630,9 @@ xfs_dquot_to_disk( 
	ddqp->d_icount = cpu_to_be64(dqp->q_ino.count);

	ddqp->d_rtbcount = cpu_to_be64(dqp->q_rtb.count);



	ddqp->d_bwarns = cpu_to_be16(dqp->q_blk.warnings);

	ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings);

	ddqp->d_rtbwarns = cpu_to_be16(dqp->q_rtb.warnings);

	ddqp->d_bwarns = 0;

	ddqp->d_iwarns = 0;

	ddqp->d_rtbwarns = 0;



	ddqp->d_btimer = xfs_dquot_to_disk_ts(dqp, dqp->q_blk.timer);

	ddqp->d_itimer = xfs_dquot_to_disk_ts(dqp, dqp->q_ino.timer);

fs/xfs/xfs_dquot.h

+0 −8
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ struct xfs_dquot_res { 
	 * in seconds since the Unix epoch.

	 */

	time64_t		timer;



	/*

	 * For root dquots, this is the maximum number of warnings that will

	 * be issued for this quota type.  Otherwise, this is the number of

	 * warnings issued against this quota.  Note that none of this is

	 * implemented.

	 */

	xfs_qwarncnt_t		warnings;

};



static inline bool

fs/xfs/xfs_qm_syscalls.c

+3 −9
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ xfs_qm_scall_setqlim( 


	if (xfs_setqlim_limits(mp, res, qlim, hard, soft, "blk"))

		xfs_dquot_set_prealloc_limits(dqp);

	if (newlim->d_fieldmask & QC_SPC_WARNS)

		res->warnings = newlim->d_spc_warns;

	if (newlim->d_fieldmask & QC_SPC_TIMER)

		xfs_setqlim_timer(mp, res, qlim, newlim->d_spc_timer);
@@ -359,8 +357,6 @@ xfs_qm_scall_setqlim( 
	qlim = id == 0 ? &defq->rtb : NULL;



	xfs_setqlim_limits(mp, res, qlim, hard, soft, "rtb");

	if (newlim->d_fieldmask & QC_RT_SPC_WARNS)

		res->warnings = newlim->d_rt_spc_warns;

	if (newlim->d_fieldmask & QC_RT_SPC_TIMER)

		xfs_setqlim_timer(mp, res, qlim, newlim->d_rt_spc_timer);
@@ -375,8 +371,6 @@ xfs_qm_scall_setqlim( 
	qlim = id == 0 ? &defq->ino : NULL;



	xfs_setqlim_limits(mp, res, qlim, hard, soft, "ino");

	if (newlim->d_fieldmask & QC_INO_WARNS)

		res->warnings = newlim->d_ino_warns;

	if (newlim->d_fieldmask & QC_INO_TIMER)

		xfs_setqlim_timer(mp, res, qlim, newlim->d_ino_timer);
@@ -417,13 +411,13 @@ xfs_qm_scall_getquota_fill_qc( 
	dst->d_ino_count = dqp->q_ino.reserved;

	dst->d_spc_timer = dqp->q_blk.timer;

	dst->d_ino_timer = dqp->q_ino.timer;

	dst->d_ino_warns = dqp->q_ino.warnings;

	dst->d_spc_warns = dqp->q_blk.warnings;

	dst->d_ino_warns = 0;

	dst->d_spc_warns = 0;

	dst->d_rt_spc_hardlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.hardlimit);

	dst->d_rt_spc_softlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.softlimit);

	dst->d_rt_space = XFS_FSB_TO_B(mp, dqp->q_rtb.reserved);

	dst->d_rt_spc_timer = dqp->q_rtb.timer;

	dst->d_rt_spc_warns = dqp->q_rtb.warnings;

	dst->d_rt_spc_warns = 0;



	/*

	 * Internally, we don't reset all the timers when quota enforcement