Commit ce576f1c authored May 20, 2014 by Namjae Jeon Committed by Dave Chinner May 20, 2014

xfs: remove XFS_TRANS_RESERVE in collapse range



There is no need to dip into reserve pool. Reserve pool is used for much
more important things. And xfs_trans_reserve will never return ENOSPC
because punch hole is already done. If we get ENOSPC, collapse range
will be simply failed.

Cc: Brian Foster <bfoster@redhat.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent d6d211db

fs/xfs/xfs_bmap_util.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1519,7 +1519,6 @@ xfs_collapse_file_space(

		while (!error && !done) {
		tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);
		tp->t_flags \|= XFS_TRANS_RESERVE;
		/*
		* We would need to reserve permanent block for transaction.
		* This will come into picture when after shifting extent into
		@@ -1529,7 +1528,6 @@ xfs_collapse_file_space(
		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
		XFS_DIOSTRAT_SPACE_RES(mp, 0), 0);
		if (error) {
		ASSERT(error == ENOSPC \|\| XFS_FORCED_SHUTDOWN(mp));
		xfs_trans_cancel(tp, 0);
		break;
		}