Merge tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm (a3112838) · Commits · 戴 / test

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)
		{
		}