Commit efd409a4 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-5.19-quota-warn-remove' into xfs-5.19-for-next

parents 45ff8b47 5349b2af

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.c

+0 −9
Original line number Diff line number Diff line
@@ -582,9 +582,6 @@ xfs_qm_init_timelimits( 
	defq->blk.time = XFS_QM_BTIMELIMIT;

	defq->ino.time = XFS_QM_ITIMELIMIT;

	defq->rtb.time = XFS_QM_RTBTIMELIMIT;

	defq->blk.warn = XFS_QM_BWARNLIMIT;

	defq->ino.warn = XFS_QM_IWARNLIMIT;

	defq->rtb.warn = XFS_QM_RTBWARNLIMIT;



	/*

	 * We try to get the limits from the superuser's limits fields.
@@ -608,12 +605,6 @@ xfs_qm_init_timelimits( 
		defq->ino.time = dqp->q_ino.timer;

	if (dqp->q_rtb.timer)

		defq->rtb.time = dqp->q_rtb.timer;

	if (dqp->q_blk.warnings)

		defq->blk.warn = dqp->q_blk.warnings;

	if (dqp->q_ino.warnings)

		defq->ino.warn = dqp->q_ino.warnings;

	if (dqp->q_rtb.warnings)

		defq->rtb.warn = dqp->q_rtb.warnings;



	xfs_qm_dqdestroy(dqp);

}

fs/xfs/xfs_qm.h

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct xfs_quota_limits { 
	xfs_qcnt_t		hard;	/* default hard limit */

	xfs_qcnt_t		soft;	/* default soft limit */

	time64_t		time;	/* limit for timers */

	xfs_qwarncnt_t		warn;	/* limit for warnings */

};



/* Defaults for each quota type: time limits, warn limits, usage limits */
@@ -134,10 +133,6 @@ struct xfs_dquot_acct { 
#define XFS_QM_RTBTIMELIMIT	(7 * 24*60*60)          /* 1 week */

#define XFS_QM_ITIMELIMIT	(7 * 24*60*60)          /* 1 week */



#define XFS_QM_BWARNLIMIT	5

#define XFS_QM_IWARNLIMIT	5

#define XFS_QM_RTBWARNLIMIT	5



extern void		xfs_qm_destroy_quotainfo(struct xfs_mount *);



/* quota ops */