Commit 766aabd5 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: flush eof/cowblocks if we can't reserve quota for file blocks 



If a fs modification (data write, reflink, xattr set, fallocate, etc.)
is unable to reserve enough quota to handle the modification, try
clearing whatever space the filesystem might have been hanging onto in
the hopes of speeding up the filesystem.  The flushing behavior will
become particularly important when we add deferred inode inactivation
because that will increase the amount of space that isn't actively tied
to user data.

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 4ca74205

fs/xfs/xfs_reflink.c

+5 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,11 @@ xfs_reflink_remap_extent( 
	 * count.  This is suboptimal, but the VFS flushed the dest range

	 * before we started.  That should have removed all the delalloc

	 * reservations, but we code defensively.

	 *

	 * xfs_trans_alloc_inode above already tried to grab an even larger

	 * quota reservation, and kicked off a blockgc scan if it couldn't.

	 * If we can't get a potentially smaller quota reservation now, we're

	 * done.

	 */

	if (!quota_reserved && !smap_real && dmap_written) {

		error = xfs_trans_reserve_quota_nblks(tp, ip,

fs/xfs/xfs_trans.c

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "xfs_inode.h"

#include "xfs_dquot_item.h"

#include "xfs_dquot.h"

#include "xfs_icache.h"



kmem_zone_t	*xfs_trans_zone;
@@ -1046,8 +1047,10 @@ xfs_trans_alloc_inode( 
{

	struct xfs_trans	*tp;

	struct xfs_mount	*mp = ip->i_mount;

	bool			retried = false;

	int			error;



retry:

	error = xfs_trans_alloc(mp, resv, dblocks,

			rblocks / mp->m_sb.sb_rextsize,

			force ? XFS_TRANS_RESERVE : 0, &tp);
@@ -1065,6 +1068,13 @@ xfs_trans_alloc_inode( 
	}



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

	if ((error == -EDQUOT || error == -ENOSPC) && !retried) {

		xfs_trans_cancel(tp);

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

		xfs_blockgc_free_quota(ip, 0);

		retried = true;

		goto retry;

	}

	if (error)

		goto out_cancel;