Commit 882d8785 authored Aug 28, 2017 by Christoph Hellwig Committed by Darrick J. Wong Sep 01, 2017

xfs: rename xfs_defer_join to xfs_defer_ijoin



Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 411350df

fs/xfs/libxfs/xfs_bmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6452,7 +6452,7 @@ __xfs_bmap_add(
		bi->bi_whichfork = whichfork;
		bi->bi_bmap = *bmap;

		error = xfs_defer_join(dfops, bi->bi_owner);
		error = xfs_defer_ijoin(dfops, bi->bi_owner);
		if (error) {
		kmem_free(bi);
		return error;

fs/xfs/libxfs/xfs_defer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ xfs_defer_has_unfinished_work(
		* to xfs_defer_finish().
		*/
		int
		xfs_defer_join(
		xfs_defer_ijoin(
		struct xfs_defer_ops *dop,
		struct xfs_inode *ip)
		{
		@@ -324,7 +324,7 @@ xfs_defer_finish(

		trace_xfs_defer_finish((*tp)->t_mountp, dop);

		xfs_defer_join(dop, ip);
		xfs_defer_ijoin(dop, ip);

		/* Until we run out of pending work to finish... */
		while (xfs_defer_has_unfinished_work(dop)) {

fs/xfs/libxfs/xfs_defer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ int xfs_defer_finish(struct xfs_trans *tp, struct xfs_defer_ops dop,
		void xfs_defer_cancel(struct xfs_defer_ops *dop);
		void xfs_defer_init(struct xfs_defer_ops dop, xfs_fsblock_t fbp);
		bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
		int xfs_defer_join(struct xfs_defer_ops dop, struct xfs_inode ip);
		int xfs_defer_ijoin(struct xfs_defer_ops dop, struct xfs_inode ip);

		/* Description of a deferred type. */
		struct xfs_defer_op_type {