xfs: rename xfs_defer_join to xfs_defer_ijoin

Source kernel commit: 882d8785fb87f691000a0b33c215364d74bd2ceb

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 74fd7a0219f30715b2ea95b1a1a6569903bbdea2..e3bbde30e6bcdef0da0fa5a6d2418a7814c633e7 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -6443,7 +6443,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;

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index fa3f72d214fdcfb0633ac3470a8b233bd0f1d7d7..7345291d3c0bb82208e367de096e7873b1f7a681 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -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)) {

diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h
index f6e93ef0bffe8a4620a136b1e7f523bb1343a941..70c944b21a2a3a18f7747eb476b840bc05bc2c6e 100644 (file)
--- a/libxfs/xfs_defer.h
+++ b/libxfs/xfs_defer.h
@@ -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 {