From d11bffeacb90a49f3074e44c29a6b96e9cd1b29c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 8 Apr 2020 09:48:15 -0400 Subject: [PATCH] libxfs: turn the xfs_buf_incore stub into an inline function Replace the macro with an inline function to avoid compiler warnings with new backports of kernel code. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- libxfs/libxfs_priv.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 6d5e47608..3cd2be5bd 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -371,8 +371,12 @@ roundup_64(uint64_t x, uint32_t y) #define XFS_BUF_UNDELAYWRITE(bp) ((bp)->b_flags &= ~LIBXFS_B_DIRTY) #define XFS_BUF_SET_BDSTRAT_FUNC(a,b) ((void) 0) -/* avoid gcc warning */ -#define xfs_buf_incore(bt,blkno,len,lockit) NULL +static inline struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target, + xfs_daddr_t blkno, size_t numblks, xfs_buf_flags_t flags) +{ + return NULL; +} + #define xfs_buf_oneshot(bp) ((void) 0) #define XBRW_READ LIBXFS_BREAD -- 2.49.0