p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfs: log items should have a xlog pointer, not a mount 

Log items belong to the log, not the xfs_mount. Convert the mount
pointer in the log item to a xlog pointer in preparation for
upcoming log centric changes to the log items.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner 2022-03-17 09:09:12 -07:00 committed by Darrick J. Wong
parent 70447e0ad9
commit d86142dd7c
10 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_bmap_item.c
View File

@ -463,7 +463,7 @@ xfs_bui_item_recover(
struct xfs_bui_log_item *buip = BUI_ITEM(lip); struct xfs_bui_log_item *buip = BUI_ITEM(lip);
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_inode *ip = NULL; struct xfs_inode *ip = NULL;
struct xfs_mount *mp = lip->li_mountp; struct xfs_mount *mp = lip->li_log->l_mp;
struct xfs_map_extent *bmap; struct xfs_map_extent *bmap;
struct xfs_bud_log_item *budp; struct xfs_bud_log_item *budp;
xfs_filblks_t count; xfs_filblks_t count;

5
fs/xfs/xfs_buf_item.c
View File

@ -21,6 +21,7 @@
#include "xfs_dquot.h" #include "xfs_dquot.h"
#include "xfs_trace.h" #include "xfs_trace.h"
#include "xfs_log.h" #include "xfs_log.h"
#include "xfs_log_priv.h"
struct kmem_cache *xfs_buf_item_cache; struct kmem_cache *xfs_buf_item_cache;
@ -428,7 +429,7 @@ xfs_buf_item_format(
* occurs during recovery. * occurs during recovery.
*/ */
if (bip->bli_flags & XFS_BLI_INODE_BUF) { if (bip->bli_flags & XFS_BLI_INODE_BUF) {
if (xfs_has_v3inodes(lip->li_mountp) || if (xfs_has_v3inodes(lip->li_log->l_mp) ||
!((bip->bli_flags & XFS_BLI_INODE_ALLOC_BUF) && !((bip->bli_flags & XFS_BLI_INODE_ALLOC_BUF) &&
xfs_log_item_in_current_chkpt(lip))) xfs_log_item_in_current_chkpt(lip)))
bip->__bli_format.blf_flags |= XFS_BLF_INODE_BUF; bip->__bli_format.blf_flags |= XFS_BLF_INODE_BUF;
@ -616,7 +617,7 @@ xfs_buf_item_put(
* that case, the bli is freed on buffer writeback completion. * that case, the bli is freed on buffer writeback completion.
*/ */
aborted = test_bit(XFS_LI_ABORTED, &lip->li_flags) || aborted = test_bit(XFS_LI_ABORTED, &lip->li_flags) ||
xfs_is_shutdown(lip->li_mountp); xlog_is_shutdown(lip->li_log);
dirty = bip->bli_flags & XFS_BLI_DIRTY; dirty = bip->bli_flags & XFS_BLI_DIRTY;
if (dirty && !aborted) if (dirty && !aborted)
return false; return false;

2
fs/xfs/xfs_extfree_item.c
View File

@ -604,7 +604,7 @@ xfs_efi_item_recover(
struct list_head *capture_list) struct list_head *capture_list)
{ {
struct xfs_efi_log_item *efip = EFI_ITEM(lip); struct xfs_efi_log_item *efip = EFI_ITEM(lip);
struct xfs_mount *mp = lip->li_mountp; struct xfs_mount *mp = lip->li_log->l_mp;
struct xfs_efd_log_item *efdp; struct xfs_efd_log_item *efdp;
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_extent *extp; struct xfs_extent *extp;

2
fs/xfs/xfs_log.c
View File

@ -1101,7 +1101,7 @@ xfs_log_item_init(
int type, int type,
const struct xfs_item_ops *ops) const struct xfs_item_ops *ops)
{ {
item->li_mountp = mp; item->li_log = mp->m_log;
item->li_ailp = mp->m_ail; item->li_ailp = mp->m_ail;
item->li_type = type; item->li_type = type;
item->li_ops = ops; item->li_ops = ops;

2
fs/xfs/xfs_log_cil.c
View File

@ -1484,7 +1484,7 @@ bool
xfs_log_item_in_current_chkpt( xfs_log_item_in_current_chkpt(
struct xfs_log_item *lip) struct xfs_log_item *lip)
{ {
struct xfs_cil *cil = lip->li_mountp->m_log->l_cilp; struct xfs_cil *cil = lip->li_log->l_cilp;
if (list_empty(&lip->li_cil)) if (list_empty(&lip->li_cil))
return false; return false;

2
fs/xfs/xfs_refcount_item.c
View File

@ -457,7 +457,7 @@ xfs_cui_item_recover(
struct xfs_cud_log_item *cudp; struct xfs_cud_log_item *cudp;
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_btree_cur *rcur = NULL; struct xfs_btree_cur *rcur = NULL;
struct xfs_mount *mp = lip->li_mountp; struct xfs_mount *mp = lip->li_log->l_mp;
xfs_fsblock_t new_fsb; xfs_fsblock_t new_fsb;
xfs_extlen_t new_len; xfs_extlen_t new_len;
unsigned int refc_type; unsigned int refc_type;

2
fs/xfs/xfs_rmap_item.c
View File

@ -510,7 +510,7 @@ xfs_rui_item_recover(
struct xfs_rud_log_item *rudp; struct xfs_rud_log_item *rudp;
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_btree_cur *rcur = NULL; struct xfs_btree_cur *rcur = NULL;
struct xfs_mount *mp = lip->li_mountp; struct xfs_mount *mp = lip->li_log->l_mp;
enum xfs_rmap_intent_type type; enum xfs_rmap_intent_type type;
xfs_exntst_t state; xfs_exntst_t state;
int i; int i;

4
fs/xfs/xfs_trace.h
View File

@ -1308,7 +1308,7 @@ DECLARE_EVENT_CLASS(xfs_log_item_class,
__field(xfs_lsn_t, lsn) __field(xfs_lsn_t, lsn)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = lip->li_mountp->m_super->s_dev; __entry->dev = lip->li_log->l_mp->m_super->s_dev;
__entry->lip = lip; __entry->lip = lip;
__entry->type = lip->li_type; __entry->type = lip->li_type;
__entry->flags = lip->li_flags; __entry->flags = lip->li_flags;
@ -1361,7 +1361,7 @@ DECLARE_EVENT_CLASS(xfs_ail_class,
__field(xfs_lsn_t, new_lsn) __field(xfs_lsn_t, new_lsn)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = lip->li_mountp->m_super->s_dev; __entry->dev = lip->li_log->l_mp->m_super->s_dev;
__entry->lip = lip; __entry->lip = lip;
__entry->type = lip->li_type; __entry->type = lip->li_type;
__entry->flags = lip->li_flags; __entry->flags = lip->li_flags;

2
fs/xfs/xfs_trans.c
View File

@ -648,7 +648,7 @@ xfs_trans_add_item(
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_log_item *lip) struct xfs_log_item *lip)
{ {
ASSERT(lip->li_mountp == tp->t_mountp); ASSERT(lip->li_log == tp->t_mountp->m_log);
ASSERT(lip->li_ailp == tp->t_mountp->m_ail); ASSERT(lip->li_ailp == tp->t_mountp->m_ail);
ASSERT(list_empty(&lip->li_trans)); ASSERT(list_empty(&lip->li_trans));
ASSERT(!test_bit(XFS_LI_DIRTY, &lip->li_flags)); ASSERT(!test_bit(XFS_LI_DIRTY, &lip->li_flags));

3
fs/xfs/xfs_trans.h
View File

@ -8,6 +8,7 @@
/* kernel only transaction subsystem defines */ /* kernel only transaction subsystem defines */
struct xlog;
struct xfs_buf; struct xfs_buf;
struct xfs_buftarg; struct xfs_buftarg;
struct xfs_efd_log_item; struct xfs_efd_log_item;
@ -31,7 +32,7 @@ struct xfs_log_item {
struct list_head li_ail; /* AIL pointers */ struct list_head li_ail; /* AIL pointers */
struct list_head li_trans; /* transaction list */ struct list_head li_trans; /* transaction list */
xfs_lsn_t li_lsn; /* last on-disk lsn */ xfs_lsn_t li_lsn; /* last on-disk lsn */
struct xfs_mount *li_mountp; /* ptr to fs mount */ struct xlog *li_log;
struct xfs_ail *li_ailp; /* ptr to AIL */ struct xfs_ail *li_ailp; /* ptr to AIL */
uint li_type; /* item type */ uint li_type; /* item type */
unsigned long li_flags; /* misc flags */ unsigned long li_flags; /* misc flags */