mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

xfs: drop unnecessary xfs_defer_finish() dfops parameter

Browse source 
Every caller of xfs_defer_finish() now passes the transaction and
its associated ->t_dfops. The xfs_defer_ops parameter is therefore
no longer necessary and can be removed.

Since most xfs_defer_finish() callers also have to consider
xfs_defer_cancel() on error, update the latter to also receive the
transaction for consistency. The log recovery code contains an
outlier case that cancels a dfops directly without an available
transaction. Retain an internal wrapper to support this outlier case
for the time being.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Brian Foster 2018-07-24 13:43:15 -07:00 committed by Darrick J. Wong
parent d5cca7eb24
commit 9e28a242be
11 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs/xfs/libxfs/xfs_attr.c
View file

@ -322,7 +322,7 @@ xfs_attr_set(
xfs_trans_bhold(args.trans, leaf_bp);
xfs_defer_bjoin(args.trans->t_dfops, leaf_bp);
xfs_defer_ijoin(args.trans->t_dfops, dp);
error = xfs_defer_finish(&args.trans, args.trans->t_dfops);
error = xfs_defer_finish(&args.trans);
if (error)
goto out;
@ -591,7 +591,7 @@ xfs_attr_leaf_addname(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
@ -680,7 +680,7 @@ xfs_attr_leaf_addname(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
}
@ -698,7 +698,7 @@ xfs_attr_leaf_addname(
}
return error;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
return error;
}
@ -744,13 +744,13 @@ xfs_attr_leaf_removename(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
}
return 0;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
return error;
}
@ -871,8 +871,7 @@ xfs_attr_node_addname(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans,
args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
@ -897,7 +896,7 @@ xfs_attr_node_addname(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
} else {
@ -994,7 +993,7 @@ xfs_attr_node_addname(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
}
@ -1023,7 +1022,7 @@ xfs_attr_node_addname(
return error;
return retval;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
goto out;
}
@ -1118,7 +1117,7 @@ xfs_attr_node_removename(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
/*
@ -1150,7 +1149,7 @@ xfs_attr_node_removename(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
} else
@ -1162,7 +1161,7 @@ xfs_attr_node_removename(
xfs_da_state_free(state);
return error;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
goto out;
}

8
fs/xfs/libxfs/xfs_attr_remote.c
View file

@ -487,7 +487,7 @@ xfs_attr_rmtval_set(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
@ -555,7 +555,7 @@ xfs_attr_rmtval_set(
ASSERT(valuelen == 0);
return 0;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
return error;
}
@ -628,7 +628,7 @@ xfs_attr_rmtval_remove(
if (error)
goto out_defer_cancel;
xfs_defer_ijoin(args->trans->t_dfops, args->dp);
error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
error = xfs_defer_finish(&args->trans);
if (error)
goto out_defer_cancel;
@ -641,6 +641,6 @@ xfs_attr_rmtval_remove(
}
return 0;
out_defer_cancel:
xfs_defer_cancel(args->trans->t_dfops);
xfs_defer_cancel(args->trans);
return error;
}

7
fs/xfs/libxfs/xfs_defer.c
View file

@ -342,9 +342,9 @@ xfs_defer_reset(
*/
int
xfs_defer_finish(
struct xfs_trans **tp,
struct xfs_defer_ops *dop)
struct xfs_trans **tp)
{
struct xfs_defer_ops *dop = (*tp)->t_dfops;
struct xfs_defer_pending *dfp;
struct list_head *li;
struct list_head *n;
@ -353,7 +353,6 @@ xfs_defer_finish(
void (*cleanup_fn)(struct xfs_trans *, void *, int);
ASSERT((*tp)->t_flags & XFS_TRANS_PERM_LOG_RES);
ASSERT((*tp)->t_dfops == dop);
trace_xfs_defer_finish((*tp)->t_mountp, dop, _RET_IP_);
@ -454,7 +453,7 @@ xfs_defer_finish(
* Free up any items left in the list.
*/
void
xfs_defer_cancel(
__xfs_defer_cancel(
struct xfs_defer_ops *dop)
{
struct xfs_defer_pending *dfp;

4
fs/xfs/libxfs/xfs_defer.h
View file

@ -48,8 +48,8 @@ enum xfs_defer_ops_type {
void xfs_defer_add(struct xfs_defer_ops *dop, enum xfs_defer_ops_type type,
struct list_head *h);
int xfs_defer_finish(struct xfs_trans **tp, struct xfs_defer_ops *dop);
void xfs_defer_cancel(struct xfs_defer_ops *dop);
int xfs_defer_finish(struct xfs_trans **tp);
void __xfs_defer_cancel(struct xfs_defer_ops *dop);
void xfs_defer_init(struct xfs_trans *tp, struct xfs_defer_ops *dop);
bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
int xfs_defer_ijoin(struct xfs_defer_ops *dop, struct xfs_inode *ip);

4
fs/xfs/xfs_bmap_util.c
View file

@ -1624,7 +1624,7 @@ xfs_swap_extent_rmap(
goto out_defer;
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(tpp, tp->t_dfops);
error = xfs_defer_finish(tpp);
tp = *tpp;
if (error)
goto out_defer;
@ -1645,7 +1645,7 @@ xfs_swap_extent_rmap(
return 0;
out_defer:
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
out:
trace_xfs_swap_extent_rmap_error(ip, error, _RET_IP_);
tip->i_d.di_flags2 = tip_flags2;

4
fs/xfs/xfs_dquot.c
View file

@ -368,7 +368,7 @@ xfs_dquot_disk_alloc(
xfs_trans_brelse(tp, bp);
goto error1;
}
error = xfs_defer_finish(tpp, tp->t_dfops);
error = xfs_defer_finish(tpp);
tp = *tpp;
if (error) {
xfs_buf_relse(bp);
@ -378,7 +378,7 @@ xfs_dquot_disk_alloc(
return 0;
error1:
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
error0:
return error;
}

4
fs/xfs/xfs_inode.c
View file

@ -1570,7 +1570,7 @@ xfs_itruncate_extents_flags(
* reservation and commit the old transaction.
*/
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(&tp, tp->t_dfops);
error = xfs_defer_finish(&tp);
if (error)
goto out_bmap_cancel;
@ -1606,7 +1606,7 @@ xfs_itruncate_extents_flags(
* the transaction can be properly aborted. We just need to make sure
* we're not holding any resources that we were not when we came in.
*/
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
goto out;
}

2
fs/xfs/xfs_log_recover.c
View file

@ -4946,7 +4946,7 @@ xlog_recover_process_intents(
xfs_trans_ail_cursor_done(&cur);
spin_unlock(&ailp->ail_lock);
if (error)
xfs_defer_cancel(&dfops);
__xfs_defer_cancel(&dfops);
else
error = xlog_finish_defer_ops(log->l_mp, &dfops);

8
fs/xfs/xfs_reflink.c
View file

@ -518,9 +518,9 @@ xfs_reflink_cancel_cow_blocks(
/* Roll the transaction */
xfs_defer_ijoin((*tpp)->t_dfops, ip);
error = xfs_defer_finish(tpp, (*tpp)->t_dfops);
error = xfs_defer_finish(tpp);
if (error) {
xfs_defer_cancel((*tpp)->t_dfops);
xfs_defer_cancel(*tpp);
break;
}
@ -716,7 +716,7 @@ xfs_reflink_end_cow(
xfs_bmap_del_extent_cow(ip, &icur, &got, &del);
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(&tp, tp->t_dfops);
error = xfs_defer_finish(&tp);
if (error)
goto out_cancel;
if (!xfs_iext_get_extent(ifp, &icur, &got))
@ -1077,7 +1077,7 @@ xfs_reflink_remap_extent(
next_extent:
/* Process all the deferred stuff. */
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(&tp, tp->t_dfops);
error = xfs_defer_finish(&tp);
if (error)
goto out_cancel;
}

13
fs/xfs/xfs_trans.c
View file

@ -933,9 +933,9 @@ __xfs_trans_commit(
/* finish deferred items on final commit */
if (!regrant && tp->t_dfops) {
error = xfs_defer_finish(&tp, tp->t_dfops);
error = xfs_defer_finish(&tp);
if (error) {
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
goto out_unreserve;
}
}
@ -1030,7 +1030,7 @@ xfs_trans_cancel(
trace_xfs_trans_cancel(tp, _RET_IP_);
if (tp->t_dfops)
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
/*
* See if the caller is relying on us to shut down the
@ -1111,3 +1111,10 @@ xfs_trans_roll(
tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
return xfs_trans_reserve(*tpp, &tres, 0, 0);
}
void
xfs_defer_cancel(
struct xfs_trans *tp)
{
__xfs_defer_cancel(tp->t_dfops);
}

3
fs/xfs/xfs_trans.h
View file

@ -214,6 +214,9 @@ xfs_trans_read_buf(
flags, bpp, ops);
}
/* cancel dfops associated with a transaction */
void xfs_defer_cancel(struct xfs_trans *);
struct xfs_buf *xfs_trans_getsb(xfs_trans_t *, struct xfs_mount *, int);
void xfs_trans_brelse(xfs_trans_t *, struct xfs_buf *);