1 files changed, 0 insertions, 70 deletions
diff --git a/0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch b/0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch
deleted file mode 100644
index c92a2f5c4..000000000
--- a/0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8b8c7d6148bc1bab3cf88cac49038a05db7dd938 Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Mon, 21 Sep 2020 11:33:23 +0200
-Subject: [PATCH] dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX
-
-dax_supported() is defined whenever CONFIG_DAX is enabled. So dummy
-implementation should be defined only in !CONFIG_DAX case, not in
-!CONFIG_FS_DAX case.
-
-Fixes: e2ec51282545 ("dm: Call proper helper to determine dax support")
-Cc: <stable@vger.kernel.org>
-Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
-Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
-Signed-off-by: Jan Kara <jack@suse.cz>
----
- include/linux/dax.h | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/include/linux/dax.h b/include/linux/dax.h
-index 497031392e0a..43b39ab9de1a 100644
---- a/include/linux/dax.h
-+++ b/include/linux/dax.h
-@@ -58,6 +58,8 @@ static inline void set_dax_synchronous(struct dax_device *dax_dev)
- {
- 	__set_dax_synchronous(dax_dev);
- }
-+bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
-+		int blocksize, sector_t start, sector_t len);
- /*
-  * Check if given mapping is supported by the file / underlying device.
-  */
-@@ -104,6 +106,12 @@ static inline bool dax_synchronous(struct dax_device *dax_dev)
- static inline void set_dax_synchronous(struct dax_device *dax_dev)
- {
- }
-+static inline bool dax_supported(struct dax_device *dax_dev,
-+		struct block_device *bdev, int blocksize, sector_t start,
-+		sector_t len)
-+{
-+	return false;
-+}
- static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
- 				struct dax_device *dax_dev)
- {
-@@ -130,8 +138,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
- 	return __generic_fsdax_supported(dax_dev, bdev, blocksize, start,
- 			sectors);
- }
--bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
--		int blocksize, sector_t start, sector_t len);
- 
- static inline void fs_put_dax(struct dax_device *dax_dev)
- {
-@@ -159,13 +165,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
- 	return false;
- }
- 
--static inline bool dax_supported(struct dax_device *dax_dev,
--		struct block_device *bdev, int blocksize, sector_t start,
--		sector_t len)
--{
--	return false;
--}
--
- static inline void fs_put_dax(struct dax_device *dax_dev)
- {
- }
--- 
-2.16.4
-