Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8214347c authored by Dave Jiang's avatar Dave Jiang Committed by Greg Kroah-Hartman
Browse files

dax: change bdev_dax_supported() to support boolean returns 



commit 80660f20 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1938576

drivers/dax/super.c

+7 −7
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); 
 * This is a library function for filesystems to check if the block device

 * 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;

	pgoff_t pgoff;
@@ -94,21 +94,21 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize) 
	if (blocksize != PAGE_SIZE) {

		pr_debug("%s: error: unsupported blocksize for dax\n",

				bdevname(bdev, buf));

		return -EINVAL;

		return false;

	}



	err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);

	if (err) {

		pr_debug("%s: error: unaligned partition for dax\n",

				bdevname(bdev, buf));

		return err;

		return false;

	}



	dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);

	if (!dax_dev) {

		pr_debug("%s: error: device does not support dax\n",

				bdevname(bdev, buf));

		return -EOPNOTSUPP;

		return false;

	}



	id = dax_read_lock();
@@ -120,10 +120,10 @@ int __bdev_dax_supported(struct block_device *bdev, int blocksize) 
	if (len < 1) {

		pr_debug("%s: error: dax access failed (%ld)\n",

				bdevname(bdev, buf), len);

		return len < 0 ? len : -EIO;

		return false;

	}



	return 0;

	return true;

}

EXPORT_SYMBOL_GPL(__bdev_dax_supported);

#endif

fs/ext2/super.c

+1 −2
Original line number Diff line number Diff line
@@ -953,8 +953,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);



	if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {

		err = bdev_dax_supported(sb->s_bdev, blocksize);

		if (err)

		if (!bdev_dax_supported(sb->s_bdev, blocksize))

			goto failed_mount;

	}

fs/ext4/super.c

+1 −2
Original line number Diff line number Diff line
@@ -3770,8 +3770,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
					" that may contain inline data");

			goto failed_mount;

		}

		err = bdev_dax_supported(sb->s_bdev, blocksize);

		if (err)

		if (!bdev_dax_supported(sb->s_bdev, blocksize))

			goto failed_mount;

	}

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1101,8 +1101,8 @@ xfs_ioctl_setattr_dax_invalidate( 
	if (fa->fsx_xflags & FS_XFLAG_DAX) {

		if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)))

			return -EINVAL;

		if (bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),

				sb->s_blocksize) < 0)

		if (!bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),

				sb->s_blocksize))

			return -EINVAL;

	}

fs/xfs/xfs_super.c

+6 −6
Original line number Diff line number Diff line
@@ -1640,17 +1640,17 @@ xfs_fs_fill_super( 
		sb->s_flags |= SB_I_VERSION;



	if (mp->m_flags & XFS_MOUNT_DAX) {

		int	error2 = 0;

		bool rtdev_is_dax = false, datadev_is_dax;



		xfs_warn(mp,

		"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);

		if (mp->m_rtdev_targp)

			error2 = bdev_dax_supported(mp->m_rtdev_targp->bt_bdev,

					sb->s_blocksize);

		if (error && error2) {

			rtdev_is_dax = bdev_dax_supported(

				mp->m_rtdev_targp->bt_bdev, sb->s_blocksize);

		if (!rtdev_is_dax && !datadev_is_dax) {

			xfs_alert(mp,

			"DAX unsupported by block device. Turning off DAX.");

			mp->m_flags &= ~XFS_MOUNT_DAX;