Browse Source

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>
Christoph Hellwig 8 years ago
parent
commit
882d8785fb
3 changed files with 4 additions and 4 deletions
  1. 1 1
      fs/xfs/libxfs/xfs_bmap.c
  2. 2 2
      fs/xfs/libxfs/xfs_defer.c
  3. 1 1
      fs/xfs/libxfs/xfs_defer.h

+ 1 - 1
fs/xfs/libxfs/xfs_bmap.c

@@ -6452,7 +6452,7 @@ __xfs_bmap_add(
 	bi->bi_whichfork = whichfork;
 	bi->bi_whichfork = whichfork;
 	bi->bi_bmap = *bmap;
 	bi->bi_bmap = *bmap;
 
 
-	error = xfs_defer_join(dfops, bi->bi_owner);
+	error = xfs_defer_ijoin(dfops, bi->bi_owner);
 	if (error) {
 	if (error) {
 		kmem_free(bi);
 		kmem_free(bi);
 		return error;
 		return error;

+ 2 - 2
fs/xfs/libxfs/xfs_defer.c

@@ -281,7 +281,7 @@ xfs_defer_has_unfinished_work(
  * to xfs_defer_finish().
  * to xfs_defer_finish().
  */
  */
 int
 int
-xfs_defer_join(
+xfs_defer_ijoin(
 	struct xfs_defer_ops		*dop,
 	struct xfs_defer_ops		*dop,
 	struct xfs_inode		*ip)
 	struct xfs_inode		*ip)
 {
 {
@@ -324,7 +324,7 @@ xfs_defer_finish(
 
 
 	trace_xfs_defer_finish((*tp)->t_mountp, dop);
 	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... */
 	/* Until we run out of pending work to finish... */
 	while (xfs_defer_has_unfinished_work(dop)) {
 	while (xfs_defer_has_unfinished_work(dop)) {

+ 1 - 1
fs/xfs/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_cancel(struct xfs_defer_ops *dop);
 void xfs_defer_init(struct xfs_defer_ops *dop, xfs_fsblock_t *fbp);
 void xfs_defer_init(struct xfs_defer_ops *dop, xfs_fsblock_t *fbp);
 bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
 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. */
 /* Description of a deferred type. */
 struct xfs_defer_op_type {
 struct xfs_defer_op_type {