xfs: cancel dfops on xfs_defer_finish() error

The current semantics of xfs_defer_finish() require the caller to
call xfs_defer_cancel() on error. This is slightly inconsistent with
transaction commit error handling where a failed commit cleans up
the transaction before returning.

More significantly, the only requirement for exposure of
->dop_pending outside of xfs_defer_finish() is so that
xfs_defer_cancel() can drain it on error. Since the only recourse of
xfs_defer_finish() errors is cancellation, mirror the transaction
logic and cancel remaining dfops before returning from
xfs_defer_finish() with an error.

Beside simplifying xfs_defer_finish() semantics, this ensures that
xfs_defer_finish() always returns with an empty ->dop_pending and
thus facilitates removal of the list from xfs_defer_ops.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 3190dfc21b605ee4bc7e4e84bf5301b26651b491..1e671d4eb6fa652681d5d1f97e7ddb9cc41488af 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -590,7 +590,7 @@ xfs_attr_leaf_addname(
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       return error;
 
                /*
                 * Commit the current trans (including the inode) and start
@@ -678,7 +678,7 @@ xfs_attr_leaf_addname(
                                goto out_defer_cancel;
                        error = xfs_defer_finish(&args->trans);
                        if (error)
-                               goto out_defer_cancel;
+                               return error;
                }
 
                /*
@@ -741,7 +741,7 @@ xfs_attr_leaf_removename(
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       return error;
        }
        return 0;
 out_defer_cancel:
@@ -867,7 +867,7 @@ restart:
                                goto out_defer_cancel;
                        error = xfs_defer_finish(&args->trans);
                        if (error)
-                               goto out_defer_cancel;
+                               goto out;
 
                        /*
                         * Commit the node conversion and start the next
@@ -891,7 +891,7 @@ restart:
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       goto out;
        } else {
                /*
                 * Addition succeeded, update Btree hashvals.
@@ -987,7 +987,7 @@ restart:
                                goto out_defer_cancel;
                        error = xfs_defer_finish(&args->trans);
                        if (error)
-                               goto out_defer_cancel;
+                               goto out;
                }
 
                /*
@@ -1110,7 +1110,7 @@ xfs_attr_node_removename(
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       goto out;
                /*
                 * Commit the Btree join operation and start a new trans.
                 */
@@ -1141,7 +1141,7 @@ xfs_attr_node_removename(
                                goto out_defer_cancel;
                        error = xfs_defer_finish(&args->trans);
                        if (error)
-                               goto out_defer_cancel;
+                               goto out;
                } else
                        xfs_trans_brelse(args->trans, bp);
        }

diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index f5255231377360f79c83985b8e84b3eeabcc0462..af094063e4029ae9b15af7d7da29419b7706485f 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -488,7 +488,7 @@ xfs_attr_rmtval_set(
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       return error;
 
                ASSERT(nmap == 1);
                ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
@@ -628,7 +628,7 @@ xfs_attr_rmtval_remove(
                        goto out_defer_cancel;
                error = xfs_defer_finish(&args->trans);
                if (error)
-                       goto out_defer_cancel;
+                       return error;
 
                /*
                 * Close out trans and start the next one in the chain.

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 7079f534c7352518d3edd84a0daf32da2206eb87..b656a399cd71ccc55012bcf473d68e3ae866c850 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -416,14 +416,15 @@ xfs_defer_finish_noroll(
        }
 
 out:
-       if (error)
+       if (error) {
                trace_xfs_defer_finish_error((*tp)->t_mountp, (*tp)->t_dfops,
                                             error);
-        else
-               trace_xfs_defer_finish_done((*tp)->t_mountp, (*tp)->t_dfops,
-                                           _RET_IP_);
+               xfs_defer_cancel(*tp);
+               return error;
+       }
 
-       return error;
+       trace_xfs_defer_finish_done((*tp)->t_mountp, (*tp)->t_dfops, _RET_IP_);
+       return 0;
 }
 
 int

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 30ac1300dc49a319cf030509f93f697a31578ee3..d9dad399440a90af0861d5def94f9c0694282c62 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1624,7 +1624,7 @@ xfs_swap_extent_rmap(
                        error = xfs_defer_finish(tpp);
                        tp = *tpp;
                        if (error)
-                               goto out_defer;
+                               goto out;
 
                        tirec.br_startoff += rlen;
                        if (tirec.br_startblock != HOLESTARTBLOCK &&

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index e1196854dbcd273edda764ca1b611beed801b0ed..70a76ac41f01601e6f04984c5c5ff56a3cf3657d 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -371,7 +371,7 @@ xfs_dquot_disk_alloc(
        tp = *tpp;
        if (error) {
                xfs_buf_relse(bp);
-               goto error1;
+               goto error0;
        }
        *bpp = bp;
        return 0;

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 7bb46a0eecfc89230870b7e16ff2416819b054fb..d957a46dc1cb8754f7cc99b35d30a15a7fb45da2 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1571,7 +1571,7 @@ xfs_itruncate_extents_flags(
                 */
                error = xfs_defer_finish(&tp);
                if (error)
-                       goto out_bmap_cancel;
+                       goto out;
 
                error = xfs_trans_roll_inode(&tp, ip);
                if (error)

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index dce8ba8ab6819761aeb6d31694077809f7a2bc3e..2ec562d75494e2e8aa0fd192a60df68b03886d04 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -518,10 +518,8 @@ xfs_reflink_cancel_cow_blocks(
 
                        /* Roll the transaction */
                        error = xfs_defer_finish(tpp);
-                       if (error) {
-                               xfs_defer_cancel(*tpp);
+                       if (error)
                                break;
-                       }
 
                        /* Remove the mapping from the CoW fork. */
                        xfs_bmap_del_extent_cow(ip, &icur, &got, &del);

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index b0130b21f4de2200c0100970e989d0c64288306c..b050663c2a709c0ed5ff3f4a6c31327799da11c1 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -933,10 +933,8 @@ __xfs_trans_commit(
                     !(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
        if (!regrant && (tp->t_flags & XFS_TRANS_PERM_LOG_RES)) {
                error = xfs_defer_finish_noroll(&tp);
-               if (error) {
-                       xfs_defer_cancel(tp);
+               if (error)
                        goto out_unreserve;
-               }
        }
 
        /*