Commit cd93a2a4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dan Williams

dax: remove __generic_fsdax_supported

Just implement generic_fsdax_supported directly out of line instead of
adding a wrapper.  Given that generic_fsdax_supported is only supplied
for CONFIG_FS_DAX builds this also allows to not provide it at all for
!CONFIG_FS_DAX builds.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20210826135510.6293-7-hch@lst.deSigned-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 673a0658
...@@ -119,9 +119,8 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev) ...@@ -119,9 +119,8 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
return dax_get_by_host(bdev->bd_disk->disk_name); return dax_get_by_host(bdev->bd_disk->disk_name);
} }
EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);
#endif
bool __generic_fsdax_supported(struct dax_device *dax_dev, bool generic_fsdax_supported(struct dax_device *dax_dev,
struct block_device *bdev, int blocksize, sector_t start, struct block_device *bdev, int blocksize, sector_t start,
sector_t sectors) sector_t sectors)
{ {
...@@ -201,7 +200,8 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, ...@@ -201,7 +200,8 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
} }
return true; return true;
} }
EXPORT_SYMBOL_GPL(__generic_fsdax_supported); EXPORT_SYMBOL_GPL(generic_fsdax_supported);
#endif /* CONFIG_FS_DAX */
/** /**
* __bdev_dax_supported() - Check if the device supports dax for filesystem * __bdev_dax_supported() - Check if the device supports dax for filesystem
...@@ -360,7 +360,7 @@ bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev, ...@@ -360,7 +360,7 @@ bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
return false; return false;
id = dax_read_lock(); id = dax_read_lock();
if (dax_alive(dax_dev)) if (dax_alive(dax_dev) && dax_dev->ops->dax_supported)
ret = dax_dev->ops->dax_supported(dax_dev, bdev, blocksize, ret = dax_dev->ops->dax_supported(dax_dev, bdev, blocksize,
start, len); start, len);
dax_read_unlock(id); dax_read_unlock(id);
......
...@@ -123,16 +123,9 @@ static inline bool bdev_dax_supported(struct block_device *bdev, int blocksize) ...@@ -123,16 +123,9 @@ static inline bool bdev_dax_supported(struct block_device *bdev, int blocksize)
return __bdev_dax_supported(bdev, blocksize); return __bdev_dax_supported(bdev, blocksize);
} }
bool __generic_fsdax_supported(struct dax_device *dax_dev, bool generic_fsdax_supported(struct dax_device *dax_dev,
struct block_device *bdev, int blocksize, sector_t start, struct block_device *bdev, int blocksize, sector_t start,
sector_t sectors); sector_t sectors);
static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
struct block_device *bdev, int blocksize, sector_t start,
sector_t sectors)
{
return __generic_fsdax_supported(dax_dev, bdev, blocksize, start,
sectors);
}
static inline void fs_put_dax(struct dax_device *dax_dev) static inline void fs_put_dax(struct dax_device *dax_dev)
{ {
...@@ -154,12 +147,7 @@ static inline bool bdev_dax_supported(struct block_device *bdev, ...@@ -154,12 +147,7 @@ static inline bool bdev_dax_supported(struct block_device *bdev,
return false; return false;
} }
static inline bool generic_fsdax_supported(struct dax_device *dax_dev, #define generic_fsdax_supported NULL
struct block_device *bdev, int blocksize, sector_t start,
sector_t sectors)
{
return false;
}
static inline void fs_put_dax(struct dax_device *dax_dev) static inline void fs_put_dax(struct dax_device *dax_dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment