Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6631f85 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: get rid of the log item descriptor 



It's just a connector between a transaction and a log item. There's
a 1:1 relationship between a log item descriptor and a log item,
and a 1:1 relationship between a log item descriptor and a
transaction. Both relationships are created and terminated at the
same time, so why do we even have the descriptor?

Replace it with a specific list_head in the log item and a new
log item dirtied flag to replace the XFS_LID_DIRTY flag.

Signed-Off-By: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
[darrick: fix up deferred agfl intent finish_item use of LID_DIRTY]
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 1a2ebf83

fs/xfs/libxfs/xfs_bmap.c

+4 −4
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ xfs_bmap_get_bp( 
	struct xfs_btree_cur	*cur,

	xfs_fsblock_t		bno)

{

	struct xfs_log_item_desc *lidp;

	struct xfs_log_item	*lip;

	int			i;



	if (!cur)
@@ -260,9 +260,9 @@ xfs_bmap_get_bp( 
	}



	/* Chase down all the log items to see if the bp is there */

	list_for_each_entry(lidp, &cur->bc_tp->t_items, lid_trans) {

		struct xfs_buf_log_item	*bip;

		bip = (struct xfs_buf_log_item *)lidp->lid_item;

	list_for_each_entry(lip, &cur->bc_tp->t_items, li_trans) {

		struct xfs_buf_log_item	*bip = (struct xfs_buf_log_item *)lip;



		if (bip->bli_item.li_type == XFS_LI_BUF &&

		    XFS_BUF_ADDR(bip->bli_buf) == bno)

			return bip->bli_buf;

fs/xfs/libxfs/xfs_shared.h

+0 −15
Original line number Diff line number Diff line
@@ -57,21 +57,6 @@ extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops; 
extern const struct xfs_buf_ops xfs_symlink_buf_ops;

extern const struct xfs_buf_ops xfs_rtbuf_ops;



/*

 * This structure is used to track log items associated with

 * a transaction.  It points to the log item and keeps some

 * flags to track the state of the log item.  It also tracks

 * the amount of space needed to log the item it describes

 * once we get to commit processing (see xfs_trans_commit()).

 */

struct xfs_log_item_desc {

	struct xfs_log_item	*lid_item;

	struct list_head	lid_trans;

	unsigned char		lid_flags;

};



#define XFS_LID_DIRTY		0x1



/* log size calculation functions */

int	xfs_log_calc_unit_res(struct xfs_mount *mp, int unit_bytes);

int	xfs_log_calc_minimum_size(struct xfs_mount *);

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ xfs_buf_item_unpin( 
			 * xfs_trans_uncommit() will try to reference the

			 * buffer which we no longer have a hold on.

			 */

			if (lip->li_desc)

			if (!list_empty(&lip->li_trans))

				xfs_trans_del_item(lip);



			/*

fs/xfs/xfs_icreate_item.c

+1 −1
Original line number Diff line number Diff line
@@ -184,5 +184,5 @@ xfs_icreate_log( 


	xfs_trans_add_item(tp, &icp->ic_item);

	tp->t_flags |= XFS_TRANS_DIRTY;

	icp->ic_item.li_desc->lid_flags |= XFS_LID_DIRTY;

	set_bit(XFS_LI_DIRTY, &icp->ic_item.li_flags);

}

fs/xfs/xfs_log.c

+5 −5
Original line number Diff line number Diff line
@@ -1047,6 +1047,7 @@ xfs_log_item_init( 
	INIT_LIST_HEAD(&item->li_ail);

	INIT_LIST_HEAD(&item->li_cil);

	INIT_LIST_HEAD(&item->li_bio_list);

	INIT_LIST_HEAD(&item->li_trans);

}



/*
@@ -2113,7 +2114,7 @@ xlog_print_trans( 
	struct xfs_trans	*tp)

{

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_log_item_desc	*lidp;

	struct xfs_log_item	*lip;



	/* dump core transaction and ticket info */

	xfs_warn(mp, "transaction summary:");
@@ -2124,8 +2125,7 @@ xlog_print_trans( 
	xlog_print_tic_res(mp, tp->t_ticket);



	/* dump each log item */

	list_for_each_entry(lidp, &tp->t_items, lid_trans) {

		struct xfs_log_item	*lip = lidp->lid_item;

	list_for_each_entry(lip, &tp->t_items, li_trans) {

		struct xfs_log_vec	*lv = lip->li_lv;

		struct xfs_log_iovec	*vec;

		int			i;