Commit 80660f20 authored by Dave Jiang's avatar Dave Jiang Committed by Darrick J. Wong

dax: change bdev_dax_supported() to support boolean returns

The function return values are confusing with the way the function is
named. We expect a true or false return value but it actually returns
0/-errno.  This makes the code very confusing. Changing the return values
to return a bool where if DAX is supported then return true and no DAX
support returns false.
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent ba23cba9
...@@ -80,9 +80,9 @@ EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); ...@@ -80,9 +80,9 @@ EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);
* This is a library function for filesystems to check if the block device * This is a library function for filesystems to check if the block device
* can be mounted with dax option. * can be mounted with dax option.
* *
* Return: negative errno if unsupported, 0 if supported. * Return: true if supported, false if unsupported
*/ */
int __bdev_dax_supported(struct block_device *bdev, int blocksize) bool __bdev_dax_supported(struct block_device *bdev, int blocksize)
{ {
struct dax_device *dax_dev; struct dax_device *dax_dev;
pgoff_t pgoff; pgoff_t pgoff;
...@@ -95,21 +95,21 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize) ...@@ -95,21 +95,21 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize)
if (blocksize != PAGE_SIZE) { if (blocksize != PAGE_SIZE) {
pr_debug("%s: error: unsupported blocksize for dax\n", pr_debug("%s: error: unsupported blocksize for dax\n",
bdevname(bdev, buf)); bdevname(bdev, buf));
return -EINVAL; return false;
} }
err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff); err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);
if (err) { if (err) {
pr_debug("%s: error: unaligned partition for dax\n", pr_debug("%s: error: unaligned partition for dax\n",
bdevname(bdev, buf)); bdevname(bdev, buf));
return err; return false;
} }
dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);
if (!dax_dev) { if (!dax_dev) {
pr_debug("%s: error: device does not support dax\n", pr_debug("%s: error: device does not support dax\n",
bdevname(bdev, buf)); bdevname(bdev, buf));
return -EOPNOTSUPP; return false;
} }
id = dax_read_lock(); id = dax_read_lock();
...@@ -121,7 +121,7 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize) ...@@ -121,7 +121,7 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize)
if (len < 1) { if (len < 1) {
pr_debug("%s: error: dax access failed (%ld)\n", pr_debug("%s: error: dax access failed (%ld)\n",
bdevname(bdev, buf), len); bdevname(bdev, buf), len);
return len < 0 ? len : -EIO; return false;
} }
if (IS_ENABLED(CONFIG_FS_DAX_LIMITED) && pfn_t_special(pfn)) { if (IS_ENABLED(CONFIG_FS_DAX_LIMITED) && pfn_t_special(pfn)) {
...@@ -139,10 +139,10 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize) ...@@ -139,10 +139,10 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize)
} else { } else {
pr_debug("%s: error: dax support not enabled\n", pr_debug("%s: error: dax support not enabled\n",
bdevname(bdev, buf)); bdevname(bdev, buf));
return -EOPNOTSUPP; return false;
} }
return 0; return true;
} }
EXPORT_SYMBOL_GPL(__bdev_dax_supported); EXPORT_SYMBOL_GPL(__bdev_dax_supported);
#endif #endif
......
...@@ -961,8 +961,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) ...@@ -961,8 +961,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
if (sbi->s_mount_opt & EXT2_MOUNT_DAX) { if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {
err = bdev_dax_supported(sb->s_bdev, blocksize); if (!bdev_dax_supported(sb->s_bdev, blocksize)) {
if (err) {
ext2_msg(sb, KERN_ERR, ext2_msg(sb, KERN_ERR,
"DAX unsupported by block device. Turning off DAX."); "DAX unsupported by block device. Turning off DAX.");
sbi->s_mount_opt &= ~EXT2_MOUNT_DAX; sbi->s_mount_opt &= ~EXT2_MOUNT_DAX;
......
...@@ -3732,8 +3732,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) ...@@ -3732,8 +3732,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
" that may contain inline data"); " that may contain inline data");
sbi->s_mount_opt &= ~EXT4_MOUNT_DAX; sbi->s_mount_opt &= ~EXT4_MOUNT_DAX;
} }
err = bdev_dax_supported(sb->s_bdev, blocksize); if (!bdev_dax_supported(sb->s_bdev, blocksize)) {
if (err) {
ext4_msg(sb, KERN_ERR, ext4_msg(sb, KERN_ERR,
"DAX unsupported by block device. Turning off DAX."); "DAX unsupported by block device. Turning off DAX.");
sbi->s_mount_opt &= ~EXT4_MOUNT_DAX; sbi->s_mount_opt &= ~EXT4_MOUNT_DAX;
......
...@@ -1103,8 +1103,8 @@ xfs_ioctl_setattr_dax_invalidate( ...@@ -1103,8 +1103,8 @@ xfs_ioctl_setattr_dax_invalidate(
if (fa->fsx_xflags & FS_XFLAG_DAX) { if (fa->fsx_xflags & FS_XFLAG_DAX) {
if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)))
return -EINVAL; return -EINVAL;
if (bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)), if (!bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),
sb->s_blocksize) < 0) sb->s_blocksize))
return -EINVAL; return -EINVAL;
} }
......
...@@ -1701,17 +1701,17 @@ xfs_fs_fill_super( ...@@ -1701,17 +1701,17 @@ xfs_fs_fill_super(
sb->s_flags |= SB_I_VERSION; sb->s_flags |= SB_I_VERSION;
if (mp->m_flags & XFS_MOUNT_DAX) { if (mp->m_flags & XFS_MOUNT_DAX) {
int error2 = 0; bool rtdev_is_dax = false, datadev_is_dax;
xfs_warn(mp, xfs_warn(mp,
"DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
error = bdev_dax_supported(mp->m_ddev_targp->bt_bdev, datadev_is_dax = bdev_dax_supported(mp->m_ddev_targp->bt_bdev,
sb->s_blocksize); sb->s_blocksize);
if (mp->m_rtdev_targp) if (mp->m_rtdev_targp)
error2 = bdev_dax_supported(mp->m_rtdev_targp->bt_bdev, rtdev_is_dax = bdev_dax_supported(
sb->s_blocksize); mp->m_rtdev_targp->bt_bdev, sb->s_blocksize);
if (error && error2) { if (!rtdev_is_dax && !datadev_is_dax) {
xfs_alert(mp, xfs_alert(mp,
"DAX unsupported by block device. Turning off DAX."); "DAX unsupported by block device. Turning off DAX.");
mp->m_flags &= ~XFS_MOUNT_DAX; mp->m_flags &= ~XFS_MOUNT_DAX;
......
...@@ -64,8 +64,8 @@ static inline bool dax_write_cache_enabled(struct dax_device *dax_dev) ...@@ -64,8 +64,8 @@ static inline bool dax_write_cache_enabled(struct dax_device *dax_dev)
struct writeback_control; struct writeback_control;
int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff); int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff);
#if IS_ENABLED(CONFIG_FS_DAX) #if IS_ENABLED(CONFIG_FS_DAX)
int __bdev_dax_supported(struct block_device *bdev, int blocksize); bool __bdev_dax_supported(struct block_device *bdev, int blocksize);
static inline int bdev_dax_supported(struct block_device *bdev, int blocksize) static inline bool bdev_dax_supported(struct block_device *bdev, int blocksize)
{ {
return __bdev_dax_supported(bdev, blocksize); return __bdev_dax_supported(bdev, blocksize);
} }
...@@ -84,10 +84,10 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev); ...@@ -84,10 +84,10 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev);
int dax_writeback_mapping_range(struct address_space *mapping, int dax_writeback_mapping_range(struct address_space *mapping,
struct block_device *bdev, struct writeback_control *wbc); struct block_device *bdev, struct writeback_control *wbc);
#else #else
static inline int bdev_dax_supported(struct block_device *bdev, static inline bool bdev_dax_supported(struct block_device *bdev,
int blocksize) int blocksize)
{ {
return -EOPNOTSUPP; return false;
} }
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)
......
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