dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX
commit5.4-rM2-2.2.x-imx-squashed88b67edd72
upstream. 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:e2ec512825
("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> Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
d6712eefc7
commit
ef6458fdbb
|
@ -56,6 +56,8 @@ static inline void set_dax_synchronous(struct dax_device *dax_dev)
|
||||||
{
|
{
|
||||||
__set_dax_synchronous(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.
|
* Check if given mapping is supported by the file / underlying device.
|
||||||
*/
|
*/
|
||||||
|
@ -102,6 +104,12 @@ static inline bool dax_synchronous(struct dax_device *dax_dev)
|
||||||
static inline void set_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,
|
static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
|
||||||
struct dax_device *dax_dev)
|
struct dax_device *dax_dev)
|
||||||
{
|
{
|
||||||
|
@ -128,8 +136,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
|
||||||
return __generic_fsdax_supported(dax_dev, bdev, blocksize, start,
|
return __generic_fsdax_supported(dax_dev, bdev, blocksize, start,
|
||||||
sectors);
|
sectors);
|
||||||
}
|
}
|
||||||
bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
|
|
||||||
int blocksize, sector_t start, sector_t len);
|
|
||||||
|
|
||||||
static inline struct dax_device *fs_dax_get_by_host(const char *host)
|
static inline struct dax_device *fs_dax_get_by_host(const char *host)
|
||||||
{
|
{
|
||||||
|
@ -167,13 +173,6 @@ static inline struct dax_device *fs_dax_get_by_host(const char *host)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
static inline void fs_put_dax(struct dax_device *dax_dev)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue