Commit 02b7ee4e authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: reserve data and rt quota at the same time 



Modify xfs_trans_reserve_quota_nblks so that we can reserve data and
realtime blocks from the dquot at the same time.  This change has the
theoretical side effect that for allocations to realtime files we will
reserve from the dquot both the number of rtblocks being allocated and
the number of bmbt blocks that might be needed to add the mapping.
However, since the mount code disables quota if it finds a realtime
device, this should not result in any behavior changes.

Now that we've moved the inode creation callers away from using the
_nblks function, we can repurpose the (now unused) ninos argument for
realtime blocks, so make that change.  This also replaces the flags
argument with a boolean parameter to force the reservation since we
don't need to distinguish between data and rt quota reservations any
more, and the only flag being passed in was FORCE_RES.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 7ac6eb46

fs/xfs/libxfs/xfs_attr.c

+1 −5
Original line number Diff line number Diff line
@@ -474,12 +474,8 @@ xfs_attr_set( 
	}



	if (args->value) {

		unsigned int	quota_flags = XFS_QMOPT_RES_REGBLKS;



		if (rsvd)

			quota_flags |= XFS_QMOPT_FORCE_RES;

		error = xfs_trans_reserve_quota_nblks(args->trans, dp,

				args->total, 0, quota_flags);

				args->total, 0, rsvd);

		if (error)

			goto out_trans_cancel;

fs/xfs/libxfs/xfs_bmap.c

+1 −3
Original line number Diff line number Diff line
@@ -1085,9 +1085,7 @@ xfs_bmap_add_attrfork( 
		return error;



	xfs_ilock(ip, XFS_ILOCK_EXCL);

	error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd ?

			XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES :

			XFS_QMOPT_RES_REGBLKS);

	error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd);

	if (error)

		goto trans_cancel;

	if (XFS_IFORK_Q(ip))

fs/xfs/xfs_bmap_util.c

+11 −13
Original line number Diff line number Diff line
@@ -727,11 +727,10 @@ xfs_alloc_file_space( 
	xfs_fileoff_t		startoffset_fsb;

	xfs_fileoff_t		endoffset_fsb;

	int			nimaps;

	int			quota_flag;

	int			rt;

	xfs_trans_t		*tp;

	xfs_bmbt_irec_t		imaps[1], *imapp;

	uint			qblocks, resblks, resrtextents;

	uint			resblks, resrtextents;

	int			error;



	trace_xfs_alloc_file_space(ip);
@@ -761,6 +760,7 @@ xfs_alloc_file_space( 
	 */

	while (allocatesize_fsb && !error) {

		xfs_fileoff_t	s, e;

		unsigned int	dblocks, rblocks;



		/*

		 * Determine space reservations for data/realtime.
@@ -790,20 +790,19 @@ xfs_alloc_file_space( 
		 */

		resblks = min_t(xfs_fileoff_t, (e - s), (MAXEXTLEN * nimaps));

		if (unlikely(rt)) {

			resrtextents = qblocks = resblks;

			resrtextents = resblks;

			resrtextents /= mp->m_sb.sb_rextsize;

			resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0);

			quota_flag = XFS_QMOPT_RES_RTBLKS;

			dblocks = XFS_DIOSTRAT_SPACE_RES(mp, 0);

			rblocks = resblks;

		} else {

			resrtextents = 0;

			resblks = qblocks = XFS_DIOSTRAT_SPACE_RES(mp, resblks);

			quota_flag = XFS_QMOPT_RES_REGBLKS;

			dblocks = XFS_DIOSTRAT_SPACE_RES(mp, resblks);

			rblocks = 0;

		}



		/*

		 * Allocate and setup the transaction.

		 */

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks,

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, dblocks,

				resrtextents, 0, &tp);



		/*
@@ -817,8 +816,8 @@ xfs_alloc_file_space( 
			break;

		}

		xfs_ilock(ip, XFS_ILOCK_EXCL);

		error = xfs_trans_reserve_quota_nblks(tp, ip, qblocks,

						      0, quota_flag);

		error = xfs_trans_reserve_quota_nblks(tp, ip, dblocks, rblocks,

				false);

		if (error)

			goto error;
@@ -881,8 +880,7 @@ xfs_unmap_extent( 
	}



	xfs_ilock(ip, XFS_ILOCK_EXCL);

	error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0,

			XFS_QMOPT_RES_REGBLKS);

	error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0, false);

	if (error)

		goto out_trans_cancel;

fs/xfs/xfs_iomap.c

+13 −13
Original line number Diff line number Diff line
@@ -194,25 +194,25 @@ xfs_iomap_write_direct( 
	struct xfs_trans	*tp;

	xfs_filblks_t		resaligned;

	int			nimaps;

	int			quota_flag;

	uint			qblocks, resblks;

	unsigned int		dblocks, rblocks;

	unsigned int		resrtextents = 0;

	int			error;

	int			bmapi_flags = XFS_BMAPI_PREALLOC;

	uint			tflags = 0;

	int			tflags = 0;

	bool			force = false;



	ASSERT(count_fsb > 0);



	resaligned = xfs_aligned_fsb_count(offset_fsb, count_fsb,

					   xfs_get_extsz_hint(ip));

	if (unlikely(XFS_IS_REALTIME_INODE(ip))) {

		resrtextents = qblocks = resaligned;

		resrtextents = resaligned;

		resrtextents /= mp->m_sb.sb_rextsize;

		resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0);

		quota_flag = XFS_QMOPT_RES_RTBLKS;

		dblocks = XFS_DIOSTRAT_SPACE_RES(mp, 0);

		rblocks = resaligned;

	} else {

		resblks = qblocks = XFS_DIOSTRAT_SPACE_RES(mp, resaligned);

		quota_flag = XFS_QMOPT_RES_REGBLKS;

		dblocks = XFS_DIOSTRAT_SPACE_RES(mp, resaligned);

		rblocks = 0;

	}



	error = xfs_qm_dqattach(ip);
@@ -235,18 +235,19 @@ xfs_iomap_write_direct( 
	if (IS_DAX(VFS_I(ip))) {

		bmapi_flags = XFS_BMAPI_CONVERT | XFS_BMAPI_ZERO;

		if (imap->br_state == XFS_EXT_UNWRITTEN) {

			force = true;

			tflags |= XFS_TRANS_RESERVE;

			resblks = qblocks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1;

			dblocks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1;

		}

	}

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, resrtextents,

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, dblocks, resrtextents,

			tflags, &tp);

	if (error)

		return error;



	xfs_ilock(ip, XFS_ILOCK_EXCL);



	error = xfs_trans_reserve_quota_nblks(tp, ip, qblocks, 0, quota_flag);

	error = xfs_trans_reserve_quota_nblks(tp, ip, dblocks, rblocks, force);

	if (error)

		goto out_trans_cancel;
@@ -559,8 +560,7 @@ xfs_iomap_write_unwritten( 
		xfs_ilock(ip, XFS_ILOCK_EXCL);

		xfs_trans_ijoin(tp, ip, 0);



		error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0,

				XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES);

		error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0, true);

		if (error)

			goto error_on_bmapi_transaction;

fs/xfs/xfs_quota.h

+5 −5
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ extern void xfs_trans_mod_dquot_byino(struct xfs_trans *, struct xfs_inode *, 
		uint, int64_t);

extern void xfs_trans_apply_dquot_deltas(struct xfs_trans *);

extern void xfs_trans_unreserve_and_mod_dquots(struct xfs_trans *);

extern int xfs_trans_reserve_quota_nblks(struct xfs_trans *,

		struct xfs_inode *, int64_t, long, uint);

int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp, struct xfs_inode *ip,

		int64_t dblocks, int64_t rblocks, bool force);

extern int xfs_trans_reserve_quota_bydquots(struct xfs_trans *,

		struct xfs_mount *, struct xfs_dquot *,

		struct xfs_dquot *, struct xfs_dquot *, int64_t, long, uint);
@@ -114,8 +114,7 @@ extern void xfs_qm_unmount_quotas(struct xfs_mount *); 
static inline int

xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t blocks)

{

	return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0,

			XFS_QMOPT_RES_REGBLKS);

	return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0, false);

}

#else

static inline int
@@ -134,7 +133,8 @@ xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid, 
#define xfs_trans_apply_dquot_deltas(tp)

#define xfs_trans_unreserve_and_mod_dquots(tp)

static inline int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp,

		struct xfs_inode *ip, int64_t nblks, long ninos, uint flags)

		struct xfs_inode *ip, int64_t dblocks, int64_t rblocks,

		bool force)

{

	return 0;

}