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

Commit 9ce632a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: add a flag to release log items on commit 



We have various items that are released from ->iop_comitting.  Add a
flag to just call ->iop_release from the commit path to avoid tons
of boilerplate code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent ddf92053

fs/xfs/xfs_bmap_item.c

+1 −26
Original line number Diff line number Diff line
@@ -209,39 +209,14 @@ xfs_bud_item_release( 
	kmem_zone_free(xfs_bud_zone, budp);

}



/*

 * When the bud item is committed to disk, all we need to do is delete our

 * reference to our partner bui item and then free ourselves. Since we're

 * freeing ourselves we must return -1 to keep the transaction code from

 * further referencing this item.

 */

STATIC xfs_lsn_t

xfs_bud_item_committed(

	struct xfs_log_item	*lip,

	xfs_lsn_t		lsn)

{

	struct xfs_bud_log_item	*budp = BUD_ITEM(lip);



	/*

	 * Drop the BUI reference regardless of whether the BUD has been

	 * aborted. Once the BUD transaction is constructed, it is the sole

	 * responsibility of the BUD to release the BUI (even if the BUI is

	 * aborted due to log I/O error).

	 */

	xfs_bui_release(budp->bud_buip);

	kmem_zone_free(xfs_bud_zone, budp);



	return (xfs_lsn_t)-1;

}



/*

 * This is the ops vector shared by all bud log items.

 */

static const struct xfs_item_ops xfs_bud_item_ops = {

	.flags		= XFS_ITEM_RELEASE_WHEN_COMMITTED,

	.iop_size	= xfs_bud_item_size,

	.iop_format	= xfs_bud_item_format,

	.iop_release	= xfs_bud_item_release,

	.iop_committed	= xfs_bud_item_committed,

};



/*

fs/xfs/xfs_extfree_item.c

+1 −26
Original line number Diff line number Diff line
@@ -308,39 +308,14 @@ xfs_efd_item_release( 
	xfs_efd_item_free(efdp);

}



/*

 * When the efd item is committed to disk, all we need to do is delete our

 * reference to our partner efi item and then free ourselves. Since we're

 * freeing ourselves we must return -1 to keep the transaction code from further

 * referencing this item.

 */

STATIC xfs_lsn_t

xfs_efd_item_committed(

	struct xfs_log_item	*lip,

	xfs_lsn_t		lsn)

{

	struct xfs_efd_log_item	*efdp = EFD_ITEM(lip);



	/*

	 * Drop the EFI reference regardless of whether the EFD has been

	 * aborted. Once the EFD transaction is constructed, it is the sole

	 * responsibility of the EFD to release the EFI (even if the EFI is

	 * aborted due to log I/O error).

	 */

	xfs_efi_release(efdp->efd_efip);

	xfs_efd_item_free(efdp);



	return (xfs_lsn_t)-1;

}



/*

 * This is the ops vector shared by all efd log items.

 */

static const struct xfs_item_ops xfs_efd_item_ops = {

	.flags		= XFS_ITEM_RELEASE_WHEN_COMMITTED,

	.iop_size	= xfs_efd_item_size,

	.iop_format	= xfs_efd_item_format,

	.iop_release	= xfs_efd_item_release,

	.iop_committed	= xfs_efd_item_committed,

};



/*

fs/xfs/xfs_icreate_item.c

+1 −17
Original line number Diff line number Diff line
@@ -63,30 +63,14 @@ xfs_icreate_item_release( 
	kmem_zone_free(xfs_icreate_zone, ICR_ITEM(lip));

}



/*

 * Because we have ordered buffers being tracked in the AIL for the inode

 * creation, we don't need the create item after this. Hence we can free

 * the log item and return -1 to tell the caller we're done with the item.

 */

STATIC xfs_lsn_t

xfs_icreate_item_committed(

	struct xfs_log_item	*lip,

	xfs_lsn_t		lsn)

{

	struct xfs_icreate_item	*icp = ICR_ITEM(lip);



	kmem_zone_free(xfs_icreate_zone, icp);

	return (xfs_lsn_t)-1;

}



/*

 * This is the ops vector shared by all buf log items.

 */

static const struct xfs_item_ops xfs_icreate_item_ops = {

	.flags		= XFS_ITEM_RELEASE_WHEN_COMMITTED,

	.iop_size	= xfs_icreate_item_size,

	.iop_format	= xfs_icreate_item_format,

	.iop_release	= xfs_icreate_item_release,

	.iop_committed	= xfs_icreate_item_committed,

};

fs/xfs/xfs_refcount_item.c

+1 −26
Original line number Diff line number Diff line
@@ -213,39 +213,14 @@ xfs_cud_item_release( 
	kmem_zone_free(xfs_cud_zone, cudp);

}



/*

 * When the cud item is committed to disk, all we need to do is delete our

 * reference to our partner cui item and then free ourselves. Since we're

 * freeing ourselves we must return -1 to keep the transaction code from

 * further referencing this item.

 */

STATIC xfs_lsn_t

xfs_cud_item_committed(

	struct xfs_log_item	*lip,

	xfs_lsn_t		lsn)

{

	struct xfs_cud_log_item	*cudp = CUD_ITEM(lip);



	/*

	 * Drop the CUI reference regardless of whether the CUD has been

	 * aborted. Once the CUD transaction is constructed, it is the sole

	 * responsibility of the CUD to release the CUI (even if the CUI is

	 * aborted due to log I/O error).

	 */

	xfs_cui_release(cudp->cud_cuip);

	kmem_zone_free(xfs_cud_zone, cudp);



	return (xfs_lsn_t)-1;

}



/*

 * This is the ops vector shared by all cud log items.

 */

static const struct xfs_item_ops xfs_cud_item_ops = {

	.flags		= XFS_ITEM_RELEASE_WHEN_COMMITTED,

	.iop_size	= xfs_cud_item_size,

	.iop_format	= xfs_cud_item_format,

	.iop_release	= xfs_cud_item_release,

	.iop_committed	= xfs_cud_item_committed,

};



/*

fs/xfs/xfs_rmap_item.c

+1 −26
Original line number Diff line number Diff line
@@ -234,39 +234,14 @@ xfs_rud_item_release( 
	kmem_zone_free(xfs_rud_zone, rudp);

}



/*

 * When the rud item is committed to disk, all we need to do is delete our

 * reference to our partner rui item and then free ourselves. Since we're

 * freeing ourselves we must return -1 to keep the transaction code from

 * further referencing this item.

 */

STATIC xfs_lsn_t

xfs_rud_item_committed(

	struct xfs_log_item	*lip,

	xfs_lsn_t		lsn)

{

	struct xfs_rud_log_item	*rudp = RUD_ITEM(lip);



	/*

	 * Drop the RUI reference regardless of whether the RUD has been

	 * aborted. Once the RUD transaction is constructed, it is the sole

	 * responsibility of the RUD to release the RUI (even if the RUI is

	 * aborted due to log I/O error).

	 */

	xfs_rui_release(rudp->rud_ruip);

	kmem_zone_free(xfs_rud_zone, rudp);



	return (xfs_lsn_t)-1;

}



/*

 * This is the ops vector shared by all rud log items.

 */

static const struct xfs_item_ops xfs_rud_item_ops = {

	.flags		= XFS_ITEM_RELEASE_WHEN_COMMITTED,

	.iop_size	= xfs_rud_item_size,

	.iop_format	= xfs_rud_item_format,

	.iop_release	= xfs_rud_item_release,

	.iop_committed	= xfs_rud_item_committed,

};



/*