| Message ID | 20190517073119.30178-15-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/20] xfs: fix a trivial comment typo in the xfs_trans_committed_bulk | expand |
On Fri, May 17, 2019 at 09:31:13AM +0200, Christoph Hellwig wrote: > There is no good reason to keep these two functions separate. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/xfs_refcount_item.c | 14 ++++++-------- > fs/xfs/xfs_refcount_item.h | 2 -- > fs/xfs/xfs_trans_refcount.c | 16 ---------------- > 3 files changed, 6 insertions(+), 26 deletions(-) > > diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c > index 2b2f6e7ad867..70dcdf40ac92 100644 > --- a/fs/xfs/xfs_refcount_item.c > +++ b/fs/xfs/xfs_refcount_item.c > @@ -217,22 +217,20 @@ static const struct xfs_item_ops xfs_cud_item_ops = { > .iop_release = xfs_cud_item_release, > }; > > -/* > - * Allocate and initialize an cud item with the given number of extents. > - */ > struct xfs_cud_log_item * > -xfs_cud_init( > - struct xfs_mount *mp, > +xfs_trans_get_cud( > + struct xfs_trans *tp, > 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); > - 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_format.cud_cui_id = cuip->cui_format.cui_id; > > + xfs_trans_add_item(tp, &cudp->cud_item); > return cudp; > } > > diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/xfs_refcount_item.h > index 3896dcc2368f..e47530f30489 100644 > --- a/fs/xfs/xfs_refcount_item.h > +++ b/fs/xfs/xfs_refcount_item.h > @@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_cui_zone; > extern struct kmem_zone *xfs_cud_zone; > > 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_release(struct xfs_cui_log_item *); > int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip); > diff --git a/fs/xfs/xfs_trans_refcount.c b/fs/xfs/xfs_trans_refcount.c > index 8d734728dd1b..d793fb500378 100644 > --- a/fs/xfs/xfs_trans_refcount.c > +++ b/fs/xfs/xfs_trans_refcount.c > @@ -17,22 +17,6 @@ > #include "xfs_alloc.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 > * transaction is marked dirty regardless of whether the refcount > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c index 2b2f6e7ad867..70dcdf40ac92 100644 --- a/fs/xfs/xfs_refcount_item.c +++ b/fs/xfs/xfs_refcount_item.c @@ -217,22 +217,20 @@ static const struct xfs_item_ops xfs_cud_item_ops = { .iop_release = xfs_cud_item_release, }; -/* - * Allocate and initialize an cud item with the given number of extents. - */ struct xfs_cud_log_item * -xfs_cud_init( - struct xfs_mount *mp, +xfs_trans_get_cud( + struct xfs_trans *tp, 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); - 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_format.cud_cui_id = cuip->cui_format.cui_id; + xfs_trans_add_item(tp, &cudp->cud_item); return cudp; } diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/xfs_refcount_item.h index 3896dcc2368f..e47530f30489 100644 --- a/fs/xfs/xfs_refcount_item.h +++ b/fs/xfs/xfs_refcount_item.h @@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_cui_zone; extern struct kmem_zone *xfs_cud_zone; 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_release(struct xfs_cui_log_item *); int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip); diff --git a/fs/xfs/xfs_trans_refcount.c b/fs/xfs/xfs_trans_refcount.c index 8d734728dd1b..d793fb500378 100644 --- a/fs/xfs/xfs_trans_refcount.c +++ b/fs/xfs/xfs_trans_refcount.c @@ -17,22 +17,6 @@ #include "xfs_alloc.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 * transaction is marked dirty regardless of whether the refcount
There is no good reason to keep these two functions separate. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_refcount_item.c | 14 ++++++-------- fs/xfs/xfs_refcount_item.h | 2 -- fs/xfs/xfs_trans_refcount.c | 16 ---------------- 3 files changed, 6 insertions(+), 26 deletions(-)