openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Brian Foster 2018-08-01 07:20:33 -07:00 committed by Darrick J. Wong
parent 60f31a609e
commit 9b1f4e9831
8 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/xfs/libxfs/xfs_attr.c
View File

@ -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 @@ xfs_attr_node_addname(
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 @@ xfs_attr_node_addname(
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 @@ xfs_attr_node_addname(
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);
}

4
fs/xfs/libxfs/xfs_attr_remote.c
View File

@ -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.

11
fs/xfs/libxfs/xfs_defer.c
View File

@ -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

2
fs/xfs/xfs_bmap_util.c
View File

@ -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 &&

2
fs/xfs/xfs_dquot.c
View File

@ -371,7 +371,7 @@ xfs_dquot_disk_alloc(
tp = *tpp;
if (error) {
xfs_buf_relse(bp);
goto error1;
goto error0;
}
*bpp = bp;
return 0;

2
fs/xfs/xfs_inode.c
View File

@ -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)

4
fs/xfs/xfs_reflink.c
View File

@ -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);

4
fs/xfs/xfs_trans.c
View File

@ -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;
}
}
/*