Message ID | 20190517073119.30178-16-hch@lst.de (mailing list archive) |
---|---|
State | Superseded, archived |
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:14AM +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_rmap_item.c | 14 ++++++-------- > fs/xfs/xfs_rmap_item.h | 2 -- > fs/xfs/xfs_trans_rmap.c | 12 ------------ > 3 files changed, 6 insertions(+), 22 deletions(-) > > diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c > index dce1357aef88..5f11e6d43484 100644 > --- a/fs/xfs/xfs_rmap_item.c > +++ b/fs/xfs/xfs_rmap_item.c > @@ -238,22 +238,20 @@ static const struct xfs_item_ops xfs_rud_item_ops = { > .iop_release = xfs_rud_item_release, > }; > > -/* > - * Allocate and initialize an rud item with the given number of extents. > - */ > struct xfs_rud_log_item * > -xfs_rud_init( > - struct xfs_mount *mp, > +xfs_trans_get_rud( > + struct xfs_trans *tp, > struct xfs_rui_log_item *ruip) > - > { > - struct xfs_rud_log_item *rudp; > + struct xfs_rud_log_item *rudp; > > rudp = kmem_zone_zalloc(xfs_rud_zone, KM_SLEEP); > - xfs_log_item_init(mp, &rudp->rud_item, XFS_LI_RUD, &xfs_rud_item_ops); > + xfs_log_item_init(tp->t_mountp, &rudp->rud_item, XFS_LI_RUD, > + &xfs_rud_item_ops); > rudp->rud_ruip = ruip; > rudp->rud_format.rud_rui_id = ruip->rui_format.rui_id; > > + xfs_trans_add_item(tp, &rudp->rud_item); > return rudp; > } > > diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h > index 7e482baa27f5..8708e4a5aa5c 100644 > --- a/fs/xfs/xfs_rmap_item.h > +++ b/fs/xfs/xfs_rmap_item.h > @@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_rui_zone; > extern struct kmem_zone *xfs_rud_zone; > > struct xfs_rui_log_item *xfs_rui_init(struct xfs_mount *, uint); > -struct xfs_rud_log_item *xfs_rud_init(struct xfs_mount *, > - struct xfs_rui_log_item *); > int xfs_rui_copy_format(struct xfs_log_iovec *buf, > struct xfs_rui_log_format *dst_rui_fmt); > void xfs_rui_item_free(struct xfs_rui_log_item *); > diff --git a/fs/xfs/xfs_trans_rmap.c b/fs/xfs/xfs_trans_rmap.c > index 5c7936b1be13..863e3281daaa 100644 > --- a/fs/xfs/xfs_trans_rmap.c > +++ b/fs/xfs/xfs_trans_rmap.c > @@ -60,18 +60,6 @@ xfs_trans_set_rmap_flags( > } > } > > -struct xfs_rud_log_item * > -xfs_trans_get_rud( > - struct xfs_trans *tp, > - struct xfs_rui_log_item *ruip) > -{ > - struct xfs_rud_log_item *rudp; > - > - rudp = xfs_rud_init(tp->t_mountp, ruip); > - xfs_trans_add_item(tp, &rudp->rud_item); > - return rudp; > -} > - > /* > * Finish an rmap update and log it to the RUD. Note that the transaction is > * marked dirty regardless of whether the rmap update succeeds or fails to > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c index dce1357aef88..5f11e6d43484 100644 --- a/fs/xfs/xfs_rmap_item.c +++ b/fs/xfs/xfs_rmap_item.c @@ -238,22 +238,20 @@ static const struct xfs_item_ops xfs_rud_item_ops = { .iop_release = xfs_rud_item_release, }; -/* - * Allocate and initialize an rud item with the given number of extents. - */ struct xfs_rud_log_item * -xfs_rud_init( - struct xfs_mount *mp, +xfs_trans_get_rud( + struct xfs_trans *tp, struct xfs_rui_log_item *ruip) - { - struct xfs_rud_log_item *rudp; + struct xfs_rud_log_item *rudp; rudp = kmem_zone_zalloc(xfs_rud_zone, KM_SLEEP); - xfs_log_item_init(mp, &rudp->rud_item, XFS_LI_RUD, &xfs_rud_item_ops); + xfs_log_item_init(tp->t_mountp, &rudp->rud_item, XFS_LI_RUD, + &xfs_rud_item_ops); rudp->rud_ruip = ruip; rudp->rud_format.rud_rui_id = ruip->rui_format.rui_id; + xfs_trans_add_item(tp, &rudp->rud_item); return rudp; } diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h index 7e482baa27f5..8708e4a5aa5c 100644 --- a/fs/xfs/xfs_rmap_item.h +++ b/fs/xfs/xfs_rmap_item.h @@ -78,8 +78,6 @@ extern struct kmem_zone *xfs_rui_zone; extern struct kmem_zone *xfs_rud_zone; struct xfs_rui_log_item *xfs_rui_init(struct xfs_mount *, uint); -struct xfs_rud_log_item *xfs_rud_init(struct xfs_mount *, - struct xfs_rui_log_item *); int xfs_rui_copy_format(struct xfs_log_iovec *buf, struct xfs_rui_log_format *dst_rui_fmt); void xfs_rui_item_free(struct xfs_rui_log_item *); diff --git a/fs/xfs/xfs_trans_rmap.c b/fs/xfs/xfs_trans_rmap.c index 5c7936b1be13..863e3281daaa 100644 --- a/fs/xfs/xfs_trans_rmap.c +++ b/fs/xfs/xfs_trans_rmap.c @@ -60,18 +60,6 @@ xfs_trans_set_rmap_flags( } } -struct xfs_rud_log_item * -xfs_trans_get_rud( - struct xfs_trans *tp, - struct xfs_rui_log_item *ruip) -{ - struct xfs_rud_log_item *rudp; - - rudp = xfs_rud_init(tp->t_mountp, ruip); - xfs_trans_add_item(tp, &rudp->rud_item); - return rudp; -} - /* * Finish an rmap update and log it to the RUD. Note that the transaction is * marked dirty regardless of whether the rmap update succeeds or fails to
There is no good reason to keep these two functions separate. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_rmap_item.c | 14 ++++++-------- fs/xfs/xfs_rmap_item.h | 2 -- fs/xfs/xfs_trans_rmap.c | 12 ------------ 3 files changed, 6 insertions(+), 22 deletions(-)