* [PATCH] libxfs: turn the xfs_buf_incore stub into an inline function
@ 2020-01-26 9:17 Christoph Hellwig
2020-01-26 21:24 ` Darrick J. Wong
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2020-01-26 9:17 UTC (permalink / raw)
To: linux-xfs
Replace the macro with an inline function to avoid compiler warnings with new
backports of kernel code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
libxfs/libxfs_priv.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 03edf0d3..2b73963c 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -369,14 +369,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) ({ \
- typeof(blkno) __foo = (blkno); \
- typeof(len) __bar = (len); \
- (blkno) = __foo; \
- (len) = __bar; /* no set-but-unused warning */ \
- 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_relse(bp) libxfs_putbuf(bp)
#define xfs_buf_get(devp,blkno,len) (libxfs_getbuf((devp), (blkno), (len)))
#define xfs_bwrite(bp) libxfs_writebuf((bp), 0)
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] libxfs: turn the xfs_buf_incore stub into an inline function
2020-01-26 9:17 [PATCH] libxfs: turn the xfs_buf_incore stub into an inline function Christoph Hellwig
@ 2020-01-26 21:24 ` Darrick J. Wong
0 siblings, 0 replies; 2+ messages in thread
From: Darrick J. Wong @ 2020-01-26 21:24 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs
On Sun, Jan 26, 2020 at 10:17:17AM +0100, Christoph Hellwig wrote:
> Replace the macro with an inline function to avoid compiler warnings with new
> backports of kernel code.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
HAH YES, thank you!!! <giddy dance>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> libxfs/libxfs_priv.h | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
> index 03edf0d3..2b73963c 100644
> --- a/libxfs/libxfs_priv.h
> +++ b/libxfs/libxfs_priv.h
> @@ -369,14 +369,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) ({ \
> - typeof(blkno) __foo = (blkno); \
> - typeof(len) __bar = (len); \
> - (blkno) = __foo; \
> - (len) = __bar; /* no set-but-unused warning */ \
> - 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_relse(bp) libxfs_putbuf(bp)
> #define xfs_buf_get(devp,blkno,len) (libxfs_getbuf((devp), (blkno), (len)))
> #define xfs_bwrite(bp) libxfs_writebuf((bp), 0)
> --
> 2.24.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-26 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-26 9:17 [PATCH] libxfs: turn the xfs_buf_incore stub into an inline function Christoph Hellwig
2020-01-26 21:24 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).