| Message ID | 20200312141715.550387-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/4] libxfs: turn the xfs_buf_incore stub into an inline function | expand |
On Thu, Mar 12, 2020 at 03:17:14PM +0100, Christoph Hellwig wrote: > This function doesn't exist in the kernel and is purely a stub in > xfsprogs, so remove it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > libxfs/libxfs_priv.h | 1 - > libxfs/logitem.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h > index 723dddcd..d07d8f32 100644 > --- a/libxfs/libxfs_priv.h > +++ b/libxfs/libxfs_priv.h > @@ -367,7 +367,6 @@ roundup_64(uint64_t x, uint32_t y) > #define XBF_DONE 0 > #define xfs_buf_stale(bp) ((bp)->b_flags |= LIBXFS_B_STALE) > #define XFS_BUF_UNDELAYWRITE(bp) ((bp)->b_flags &= ~LIBXFS_B_DIRTY) > -#define XFS_BUF_SET_BDSTRAT_FUNC(a,b) ((void) 0) > > static inline struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target, > xfs_daddr_t blkno, size_t numblks, xfs_buf_flags_t flags) > diff --git a/libxfs/logitem.c b/libxfs/logitem.c > index b11df4fa..d0819dcb 100644 > --- a/libxfs/logitem.c > +++ b/libxfs/logitem.c > @@ -84,7 +84,6 @@ xfs_buf_item_init( > * the first. If we do already have one, there is > * nothing to do here so return. > */ > - XFS_BUF_SET_BDSTRAT_FUNC(bp, xfs_bdstrat_cb); > if (bp->b_log_item != NULL) { > lip = bp->b_log_item; > if (lip->li_type == XFS_LI_BUF) { > -- > 2.24.1 >
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 723dddcd..d07d8f32 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -367,7 +367,6 @@ roundup_64(uint64_t x, uint32_t y) #define XBF_DONE 0 #define xfs_buf_stale(bp) ((bp)->b_flags |= LIBXFS_B_STALE) #define XFS_BUF_UNDELAYWRITE(bp) ((bp)->b_flags &= ~LIBXFS_B_DIRTY) -#define XFS_BUF_SET_BDSTRAT_FUNC(a,b) ((void) 0) static inline struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target, xfs_daddr_t blkno, size_t numblks, xfs_buf_flags_t flags) diff --git a/libxfs/logitem.c b/libxfs/logitem.c index b11df4fa..d0819dcb 100644 --- a/libxfs/logitem.c +++ b/libxfs/logitem.c @@ -84,7 +84,6 @@ xfs_buf_item_init( * the first. If we do already have one, there is * nothing to do here so return. */ - XFS_BUF_SET_BDSTRAT_FUNC(bp, xfs_bdstrat_cb); if (bp->b_log_item != NULL) { lip = bp->b_log_item; if (lip->li_type == XFS_LI_BUF) {
This function doesn't exist in the kernel and is purely a stub in xfsprogs, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- libxfs/libxfs_priv.h | 1 - libxfs/logitem.c | 1 - 2 files changed, 2 deletions(-)