Commit 88b67edd authored by Jan Kara's avatar Jan Kara Committed by Dan Williams
Browse files

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: e2ec5128 ("dm: Call proper helper to determine dax support")
Cc: <stable@vger.kernel.org>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ba4f184e

include/linux/dax.h

+8 −9
Original line number Diff line number Diff line
@@ -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)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE