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

Commit 73f0d236 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: merge xfs_bud_init into xfs_trans_get_bud 



There is no good reason to keep these two functions separate.

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 60883447

fs/xfs/xfs_bmap_item.c

+6 −8
Original line number Diff line number Diff line
@@ -213,22 +213,20 @@ static const struct xfs_item_ops xfs_bud_item_ops = { 
	.iop_release	= xfs_bud_item_release,

};



/*

 * Allocate and initialize an bud item with the given number of extents.

 */

struct xfs_bud_log_item *

xfs_bud_init(

	struct xfs_mount		*mp,

xfs_trans_get_bud(

	struct xfs_trans		*tp,

	struct xfs_bui_log_item		*buip)



{

	struct xfs_bud_log_item		*budp;



	budp = kmem_zone_zalloc(xfs_bud_zone, KM_SLEEP);

	xfs_log_item_init(mp, &budp->bud_item, XFS_LI_BUD, &xfs_bud_item_ops);

	xfs_log_item_init(tp->t_mountp, &budp->bud_item, XFS_LI_BUD,

			  &xfs_bud_item_ops);

	budp->bud_buip = buip;

	budp->bud_format.bud_bui_id = buip->bui_format.bui_id;



	xfs_trans_add_item(tp, &budp->bud_item);

	return budp;

}

fs/xfs/xfs_bmap_item.h

+0 −2
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ extern struct kmem_zone *xfs_bui_zone; 
extern struct kmem_zone	*xfs_bud_zone;



struct xfs_bui_log_item *xfs_bui_init(struct xfs_mount *);

struct xfs_bud_log_item *xfs_bud_init(struct xfs_mount *,

		struct xfs_bui_log_item *);

void xfs_bui_item_free(struct xfs_bui_log_item *);

void xfs_bui_release(struct xfs_bui_log_item *);

int xfs_bui_recover(struct xfs_trans *parent_tp, struct xfs_bui_log_item *buip);

fs/xfs/xfs_trans_bmap.c

+0 −16
Original line number Diff line number Diff line
@@ -18,22 +18,6 @@ 
#include "xfs_bmap.h"

#include "xfs_inode.h"



/*

 * This routine is called to allocate a "bmap update done"

 * log item.

 */

struct xfs_bud_log_item *

xfs_trans_get_bud(

	struct xfs_trans		*tp,

	struct xfs_bui_log_item		*buip)

{

	struct xfs_bud_log_item		*budp;



	budp = xfs_bud_init(tp->t_mountp, buip);

	xfs_trans_add_item(tp, &budp->bud_item);

	return budp;

}



/*

 * Finish an bmap update and log it to the BUD. Note that the

 * transaction is marked dirty regardless of whether the bmap update