提交 ebeb8e06 编写于 作者: C Christoph Hellwig 提交者: Darrick J. Wong

xfs: merge xfs_cud_init into xfs_trans_get_cud

There is no good reason to keep these two functions separate.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NBrian Foster <bfoster@redhat.com>
Reviewed-by: NDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: NDarrick J. Wong <darrick.wong@oracle.com>
上级 9c5e7c2a
...@@ -217,22 +217,20 @@ static const struct xfs_item_ops xfs_cud_item_ops = { ...@@ -217,22 +217,20 @@ static const struct xfs_item_ops xfs_cud_item_ops = {
.iop_release = xfs_cud_item_release, .iop_release = xfs_cud_item_release,
}; };
/*
* Allocate and initialize an cud item with the given number of extents.
*/
struct xfs_cud_log_item * struct xfs_cud_log_item *
xfs_cud_init( xfs_trans_get_cud(
struct xfs_mount *mp, struct xfs_trans *tp,
struct xfs_cui_log_item *cuip) struct xfs_cui_log_item *cuip)
{ {
struct xfs_cud_log_item *cudp; struct xfs_cud_log_item *cudp;
cudp = kmem_zone_zalloc(xfs_cud_zone, KM_SLEEP); cudp = kmem_zone_zalloc(xfs_cud_zone, KM_SLEEP);
xfs_log_item_init(mp, &cudp->cud_item, XFS_LI_CUD, &xfs_cud_item_ops); xfs_log_item_init(tp->t_mountp, &cudp->cud_item, XFS_LI_CUD,
&xfs_cud_item_ops);
cudp->cud_cuip = cuip; cudp->cud_cuip = cuip;
cudp->cud_format.cud_cui_id = cuip->cui_format.cui_id; cudp->cud_format.cud_cui_id = cuip->cui_format.cui_id;
xfs_trans_add_item(tp, &cudp->cud_item);
return cudp; return cudp;
} }
......
...@@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_cui_zone; ...@@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_cui_zone;
extern struct kmem_zone *xfs_cud_zone; extern struct kmem_zone *xfs_cud_zone;
struct xfs_cui_log_item *xfs_cui_init(struct xfs_mount *, uint); struct xfs_cui_log_item *xfs_cui_init(struct xfs_mount *, uint);
struct xfs_cud_log_item *xfs_cud_init(struct xfs_mount *,
struct xfs_cui_log_item *);
void xfs_cui_item_free(struct xfs_cui_log_item *); void xfs_cui_item_free(struct xfs_cui_log_item *);
void xfs_cui_release(struct xfs_cui_log_item *); void xfs_cui_release(struct xfs_cui_log_item *);
int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip); int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip);
......
...@@ -17,22 +17,6 @@ ...@@ -17,22 +17,6 @@
#include "xfs_alloc.h" #include "xfs_alloc.h"
#include "xfs_refcount.h" #include "xfs_refcount.h"
/*
* This routine is called to allocate a "refcount update done"
* log item.
*/
struct xfs_cud_log_item *
xfs_trans_get_cud(
struct xfs_trans *tp,
struct xfs_cui_log_item *cuip)
{
struct xfs_cud_log_item *cudp;
cudp = xfs_cud_init(tp->t_mountp, cuip);
xfs_trans_add_item(tp, &cudp->cud_item);
return cudp;
}
/* /*
* Finish an refcount update and log it to the CUD. Note that the * Finish an refcount update and log it to the CUD. Note that the
* transaction is marked dirty regardless of whether the refcount * transaction is marked dirty regardless of whether the refcount
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册