redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

xfs: don't use xfs_trans_free_items in the commit path 

While commiting items looks very similar to freeing them on error it is
a different operation, and they will diverge a bit soon.

Split out the commit case from xfs_trans_free_items, inline it into
xfs_log_commit_cil and give it a separate trace point.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
alistair/sunxi64-5.4-dsi
Christoph Hellwig 2019-06-28 19:27:31 -07:00 committed by Darrick J. Wong
parent 8e4b20ea83
commit 195cd83d1b
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/xfs/xfs_log_cil.c
View File

@ -985,6 +985,7 @@ xfs_log_commit_cil(
{ {
struct xlog *log = mp->m_log; struct xlog *log = mp->m_log;
struct xfs_cil *cil = log->l_cilp; struct xfs_cil *cil = log->l_cilp;
struct xfs_log_item *lip, *next;
xfs_lsn_t xc_commit_lsn; xfs_lsn_t xc_commit_lsn;
/* /*
@ -1009,7 +1010,7 @@ xfs_log_commit_cil(
/* /*
* Once all the items of the transaction have been copied to the CIL, * Once all the items of the transaction have been copied to the CIL,
* the items can be unlocked and freed. * the items can be unlocked and possibly freed.
* *
* This needs to be done before we drop the CIL context lock because we * This needs to be done before we drop the CIL context lock because we
* have to update state in the log items and unlock them before they go * have to update state in the log items and unlock them before they go
@ -1018,8 +1019,14 @@ xfs_log_commit_cil(
* the log items. This affects (at least) processing of stale buffers, * the log items. This affects (at least) processing of stale buffers,
* inodes and EFIs. * inodes and EFIs.
*/ */
xfs_trans_free_items(tp, xc_commit_lsn, false); trace_xfs_trans_commit_items(tp, _RET_IP_);
list_for_each_entry_safe(lip, next, &tp->t_items, li_trans) {
xfs_trans_del_item(lip);
if (lip->li_ops->iop_committing)
lip->li_ops->iop_committing(lip, xc_commit_lsn);
if (lip->li_ops->iop_unlock)
lip->li_ops->iop_unlock(lip);
}
xlog_cil_push_background(log); xlog_cil_push_background(log);
up_read(&cil->xc_ctx_lock); up_read(&cil->xc_ctx_lock);

1
fs/xfs/xfs_trace.h
View File

@ -3360,6 +3360,7 @@ DEFINE_TRANS_EVENT(xfs_trans_dup);
DEFINE_TRANS_EVENT(xfs_trans_free); DEFINE_TRANS_EVENT(xfs_trans_free);
DEFINE_TRANS_EVENT(xfs_trans_roll); DEFINE_TRANS_EVENT(xfs_trans_roll);
DEFINE_TRANS_EVENT(xfs_trans_add_item); DEFINE_TRANS_EVENT(xfs_trans_add_item);
DEFINE_TRANS_EVENT(xfs_trans_commit_items);
DEFINE_TRANS_EVENT(xfs_trans_free_items); DEFINE_TRANS_EVENT(xfs_trans_free_items);
TRACE_EVENT(xfs_iunlink_update_bucket, TRACE_EVENT(xfs_iunlink_update_bucket,

10
fs/xfs/xfs_trans.c
View File

@ -767,10 +767,9 @@ xfs_trans_del_item(
} }
/* Detach and unlock all of the items in a transaction */ /* Detach and unlock all of the items in a transaction */
void static void
xfs_trans_free_items( xfs_trans_free_items(
struct xfs_trans *tp, struct xfs_trans *tp,
xfs_lsn_t commit_lsn,
bool abort) bool abort)
{ {
struct xfs_log_item *lip, *next; struct xfs_log_item *lip, *next;
@ -779,9 +778,6 @@ xfs_trans_free_items(
list_for_each_entry_safe(lip, next, &tp->t_items, li_trans) { list_for_each_entry_safe(lip, next, &tp->t_items, li_trans) {
xfs_trans_del_item(lip); xfs_trans_del_item(lip);
if (commit_lsn != NULLCOMMITLSN &&
lip->li_ops->iop_committing)
lip->li_ops->iop_committing(lip, commit_lsn);
if (abort) if (abort)
set_bit(XFS_LI_ABORTED, &lip->li_flags); set_bit(XFS_LI_ABORTED, &lip->li_flags);
@ -1007,7 +1003,7 @@ out_unreserve:
tp->t_ticket = NULL; tp->t_ticket = NULL;
} }
current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);
xfs_trans_free_items(tp, NULLCOMMITLSN, !!error); xfs_trans_free_items(tp, !!error);
xfs_trans_free(tp); xfs_trans_free(tp);
XFS_STATS_INC(mp, xs_trans_empty); XFS_STATS_INC(mp, xs_trans_empty);
@ -1069,7 +1065,7 @@ xfs_trans_cancel(
/* mark this thread as no longer being in a transaction */ /* mark this thread as no longer being in a transaction */
current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);
xfs_trans_free_items(tp, NULLCOMMITLSN, dirty); xfs_trans_free_items(tp, dirty);
xfs_trans_free(tp); xfs_trans_free(tp);
} }

2
fs/xfs/xfs_trans_priv.h
View File

@ -16,8 +16,6 @@ struct xfs_log_vec;
void xfs_trans_init(struct xfs_mount *); void xfs_trans_init(struct xfs_mount *);
void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *); void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *);
void xfs_trans_del_item(struct xfs_log_item *); void xfs_trans_del_item(struct xfs_log_item *);
void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn,
bool abort);
void xfs_trans_unreserve_and_mod_sb(struct xfs_trans *tp); void xfs_trans_unreserve_and_mod_sb(struct xfs_trans *tp);
void xfs_trans_committed_bulk(struct xfs_ail *ailp, struct xfs_log_vec *lv, void xfs_trans_committed_bulk(struct xfs_ail *ailp, struct xfs_log_vec *lv,