Merge tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fix from Dan Williams:
"Fix compilation for the new dax_supported() exported helper"

* tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX

+8 -9
+8 -9
include/linux/dax.h
··· 58 { 59 __set_dax_synchronous(dax_dev); 60 } 61 /* 62 * Check if given mapping is supported by the file / underlying device. 63 */ ··· 106 static inline void set_dax_synchronous(struct dax_device *dax_dev) 107 { 108 } 109 static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, 110 struct dax_device *dax_dev) 111 { ··· 138 return __generic_fsdax_supported(dax_dev, bdev, blocksize, start, 139 sectors); 140 } 141 - bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev, 142 - int blocksize, sector_t start, sector_t len); 143 144 static inline void fs_put_dax(struct dax_device *dax_dev) 145 { ··· 161 static inline bool generic_fsdax_supported(struct dax_device *dax_dev, 162 struct block_device *bdev, int blocksize, sector_t start, 163 sector_t sectors) 164 - { 165 - return false; 166 - } 167 - 168 - static inline bool dax_supported(struct dax_device *dax_dev, 169 - struct block_device *bdev, int blocksize, sector_t start, 170 - sector_t len) 171 { 172 return false; 173 }
··· 58 { 59 __set_dax_synchronous(dax_dev); 60 } 61 + bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev, 62 + int blocksize, sector_t start, sector_t len); 63 /* 64 * Check if given mapping is supported by the file / underlying device. 65 */ ··· 104 static inline void set_dax_synchronous(struct dax_device *dax_dev) 105 { 106 } 107 + static inline bool dax_supported(struct dax_device *dax_dev, 108 + struct block_device *bdev, int blocksize, sector_t start, 109 + sector_t len) 110 + { 111 + return false; 112 + } 113 static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, 114 struct dax_device *dax_dev) 115 { ··· 130 return __generic_fsdax_supported(dax_dev, bdev, blocksize, start, 131 sectors); 132 } 133 134 static inline void fs_put_dax(struct dax_device *dax_dev) 135 { ··· 155 static inline bool generic_fsdax_supported(struct dax_device *dax_dev, 156 struct block_device *bdev, int blocksize, sector_t start, 157 sector_t sectors) 158 { 159 return false; 160 }