diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-09-22 13:15:19 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-09-22 13:15:42 +0300 |
| commit | b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248 (patch) | |
| tree | 22a68caea35b25309595167acc387c491d934d24 /include/linux | |
| parent | ba4f184e126b751d1bffad5897f263108befc780 (diff) | |
| parent | 98477740630f270aecf648f1d6a9dbc6027d4ff1 (diff) | |
| download | cachepc-linux-b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248.tar.gz cachepc-linux-b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248.zip | |
Merge remote-tracking branch 'origin/master' into drm-intel-fixes
Direct backmerge to get commit 88b67edd7247 ("dax: Fix compilation for
CONFIG_DAX && !CONFIG_FS_DAX") to fix CI build issues.
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dax.h | 17 |
1 files 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) { } |