[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200620071644.463185-9-hch@lst.de>
Date: Sat, 20 Jun 2020 09:16:42 +0200
From: Christoph Hellwig <hch@....de>
To: Jens Axboe <axboe@...nel.dk>
Cc: Al Viro <viro@...iv.linux.org.uk>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jiri Slaby <jslaby@...e.com>, linux-block@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 08/10] fs: move the buffer_heads_over_limit stub to buffer_head.h
Move the !CONFIG_BLOCK stub to the same place as the non-stub
declaration.
Signed-off-by: Christoph Hellwig <hch@....de>
---
include/linux/blkdev.h | 1 -
include/linux/buffer_head.h | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 50fccb121b876e..973253ce202d87 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1840,7 +1840,6 @@ struct block_device;
/*
* stubs for when the block layer is configured out
*/
-#define buffer_heads_over_limit 0
static inline long nr_blockdev_pages(void)
{
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 22fb11e2d2e04d..6b47f94378c5ad 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -406,6 +406,7 @@ static inline int inode_has_buffers(struct inode *inode) { return 0; }
static inline void invalidate_inode_buffers(struct inode *inode) {}
static inline int remove_inode_buffers(struct inode *inode) { return 1; }
static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
+#define buffer_heads_over_limit 0
#endif /* CONFIG_BLOCK */
#endif /* _LINUX_BUFFER_HEAD_H */
--
2.26.2
Powered by blists - more mailing lists