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

Commit b3934213 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: remove the lid_size field in struct log_item_desc 



Outside the now removed nodelaylog code this field is only used for
asserts and can be safely removed now.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 0244b960

fs/xfs/xfs_dquot_item.c

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ xfs_qm_dquot_logitem_format( 
	logvec->i_len  = sizeof(xfs_disk_dquot_t);

	logvec->i_type = XLOG_REG_TYPE_DQUOT;



	ASSERT(2 == lip->li_desc->lid_size);

	qlip->qli_format.qlf_size = 2;



}

fs/xfs/xfs_inode_item.c

+0 −2
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ xfs_inode_item_format( 
	 * Assert that no attribute-related log flags are set.

	 */

	if (!XFS_IFORK_Q(ip)) {

		ASSERT(nvecs == lip->li_desc->lid_size);

		iip->ili_format.ilf_size = nvecs;

		ASSERT(!(iip->ili_format.ilf_fields &

			 (XFS_ILOG_ADATA | XFS_ILOG_ABROOT | XFS_ILOG_AEXT)));
@@ -521,7 +520,6 @@ xfs_inode_item_format( 
		break;

	}



	ASSERT(nvecs == lip->li_desc->lid_size);

	iip->ili_format.ilf_size = nvecs;

}

fs/xfs/xfs_log_cil.c

+5 −4
Original line number Diff line number Diff line
@@ -179,23 +179,24 @@ xlog_cil_prepare_log_vecs( 
		void	*ptr;

		int	index;

		int	len = 0;

		uint	niovecs;



		/* Skip items which aren't dirty in this transaction. */

		if (!(lidp->lid_flags & XFS_LID_DIRTY))

			continue;



		/* Skip items that do not have any vectors for writing */

		lidp->lid_size = IOP_SIZE(lidp->lid_item);

		if (!lidp->lid_size)

		niovecs = IOP_SIZE(lidp->lid_item);

		if (!niovecs)

			continue;



		new_lv = kmem_zalloc(sizeof(*new_lv) +

				lidp->lid_size * sizeof(struct xfs_log_iovec),

				niovecs * sizeof(struct xfs_log_iovec),

				KM_SLEEP);



		/* The allocated iovec region lies beyond the log vector. */

		new_lv->lv_iovecp = (struct xfs_log_iovec *)&new_lv[1];

		new_lv->lv_niovecs = lidp->lid_size;

		new_lv->lv_niovecs = niovecs;

		new_lv->lv_item = lidp->lid_item;



		/* build the vector array and calculate it's length */

fs/xfs/xfs_trans.c

+0 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,6 @@ xfs_trans_add_item( 


	lidp->lid_item = lip;

	lidp->lid_flags = 0;

	lidp->lid_size = 0;

	list_add_tail(&lidp->lid_trans, &tp->t_items);



	lip->li_desc = lidp;

fs/xfs/xfs_trans.h

+1 −2
Original line number Diff line number Diff line
@@ -163,9 +163,8 @@ typedef struct xfs_trans_header { 
 */

struct xfs_log_item_desc {

	struct xfs_log_item	*lid_item;

	ushort			lid_size;

	unsigned char		lid_flags;

	struct list_head	lid_trans;

	unsigned char		lid_flags;

};



#define XFS_LID_DIRTY		0x1