Commit 9f99c8fe authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor quota timestamp coding 



Refactor quota timestamp encoding and decoding into helper functions so
that we can add extra behavior in the next patch.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent ccc8e771

fs/xfs/libxfs/xfs_dquot_buf.c

+18 −0
Original line number Diff line number Diff line
@@ -288,3 +288,21 @@ const struct xfs_buf_ops xfs_dquot_buf_ra_ops = { 
	.verify_read = xfs_dquot_buf_readahead_verify,

	.verify_write = xfs_dquot_buf_write_verify,

};



/* Convert an on-disk timer value into an incore timer value. */

time64_t

xfs_dquot_from_disk_ts(

	struct xfs_disk_dquot	*ddq,

	__be32			dtimer)

{

	return be32_to_cpu(dtimer);

}



/* Convert an incore timer value into an on-disk timer value. */

__be32

xfs_dquot_to_disk_ts(

	struct xfs_dquot	*dqp,

	time64_t		timer)

{

	return cpu_to_be32(timer);

}

fs/xfs/libxfs/xfs_quota_defs.h

+5 −0
Original line number Diff line number Diff line
@@ -143,4 +143,9 @@ extern int xfs_calc_dquots_per_chunk(unsigned int nbblks); 
extern void xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb,

		xfs_dqid_t id, xfs_dqtype_t type);



struct xfs_dquot;

time64_t xfs_dquot_from_disk_ts(struct xfs_disk_dquot *ddq,

		__be32 dtimer);

__be32 xfs_dquot_to_disk_ts(struct xfs_dquot *ddq, time64_t timer);



#endif	/* __XFS_QUOTA_H__ */

fs/xfs/xfs_dquot.c

+6 −6
Original line number Diff line number Diff line
@@ -536,9 +536,9 @@ xfs_dquot_from_disk( 
	dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns);

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



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

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

	dqp->q_rtb.timer = be32_to_cpu(ddqp->d_rtbtimer);

	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);



	/*

	 * Reservation counters are defined as reservation plus current usage
@@ -581,9 +581,9 @@ xfs_dquot_to_disk( 
	ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings);

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



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

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

	ddqp->d_rtbtimer = cpu_to_be32(dqp->q_rtb.timer);

	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);

	ddqp->d_rtbtimer = xfs_dquot_to_disk_ts(dqp, dqp->q_rtb.timer);

}



/* Allocate and initialize the dquot buffer for this in-core dquot. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE