Commit 0949d317 authored by Allison Collins's avatar Allison Collins Committed by Darrick J. Wong
Browse files

xfs: Pull up trans roll from xfs_attr3_leaf_setflag 



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

Signed-off-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.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 6cc5b5f8

fs/xfs/libxfs/xfs_attr.c

+5 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,11 @@ xfs_attr_node_removename( 
		error = xfs_attr3_leaf_setflag(args);

		if (error)

			goto out;



		error = xfs_trans_roll_inode(&args->trans, args->dp);

		if (error)

			goto out;



		error = xfs_attr_rmtval_remove(args);

		if (error)

			goto out;

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −4
Original line number Diff line number Diff line
@@ -2833,10 +2833,7 @@ xfs_attr3_leaf_setflag( 
			 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;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE