From abdc294d6d5c88f1ea905ee192686261e47a473a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 21 Sep 2020 10:06:16 -0500 Subject: Compilation fix from upstream Signed-off-by: Justin M. Forbes --- ...-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch | 70 ++++++++++++++++++++++ kernel.spec | 2 + 2 files changed, 72 insertions(+) create mode 100644 0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch 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 new file mode 100644 index 000000000..c92a2f5c4 --- /dev/null +++ b/0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch @@ -0,0 +1,70 @@ +From 8b8c7d6148bc1bab3cf88cac49038a05db7dd938 Mon Sep 17 00:00:00 2001 +From: Jan Kara +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: +Reported-by: Geert Uytterhoeven +Reported-by: Naresh Kamboju +Signed-off-by: Jan Kara +--- + 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 + diff --git a/kernel.spec b/kernel.spec index 882bd861b..e6a4dfc45 100644 --- a/kernel.spec +++ b/kernel.spec @@ -789,6 +789,7 @@ Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch Patch75: 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch +Patch76: 0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch %endif @@ -1366,6 +1367,7 @@ ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.pat ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch ApplyOptionalPatch 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch +ApplyOptionalPatch 0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch %endif -- cgit