Commit 1fc618d7 authored by Allison Collins's avatar Allison Collins Committed by Darrick J. Wong
Browse files

xfs: Pull up trans roll in xfs_attr3_leaf_clearflag



New delayed allocation routines cannot be handling transactions so
pull them out into the calling functions

Signed-off-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDave Chinner <dchinner@redhat.com>
parent 79514109
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -709,6 +709,14 @@ xfs_attr_leaf_addname(
		 * Added a "remote" value, just clear the incomplete flag.
		 */
		error = xfs_attr3_leaf_clearflag(args);
		if (error)
			return error;

		/*
		 * Commit the flag value change and start the next trans in
		 * series.
		 */
		error = xfs_trans_roll_inode(&args->trans, args->dp);
	}
	return error;
}
@@ -1067,6 +1075,14 @@ restart:
		error = xfs_attr3_leaf_clearflag(args);
		if (error)
			goto out;

		 /*
		  * Commit the flag value change and start the next trans in
		  * series.
		  */
		error = xfs_trans_roll_inode(&args->trans, args->dp);
		if (error)
			goto out;
	}
	retval = error = 0;

+1 −4
Original line number Diff line number Diff line
@@ -2782,10 +2782,7 @@ xfs_attr3_leaf_clearflag(
			 XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
	}

	/*
	 * Commit the flag value change and start the next trans in series.
	 */
	return xfs_trans_roll_inode(&args->trans, args->dp);
	return 0;
}

/*