diff options
| author | Darrick J. Wong | 2018-05-30 22:03:45 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2018-05-31 17:58:33 +0200 |
| commit | ba23cba9b3bdc967aabdc6ff1e3e9b11ce05bb4f (patch) | |
| tree | ab508ad6c442fa52b4b59a27edb5084279dbb6d9 /fs/xfs/xfs_super.c | |
| parent | xfs: repair superblocks (diff) | |
| download | kernel-qcow2-linux-ba23cba9b3bdc967aabdc6ff1e3e9b11ce05bb4f.tar.gz kernel-qcow2-linux-ba23cba9b3bdc967aabdc6ff1e3e9b11ce05bb4f.tar.xz kernel-qcow2-linux-ba23cba9b3bdc967aabdc6ff1e3e9b11ce05bb4f.zip | |
fs: allow per-device dax status checking for filesystems
Change bdev_dax_supported so it takes a bdev parameter. This enables
multi-device filesystems like xfs to check that a dax device can work for
the particular filesystem. Once that's in place, actually fix all the
parts of XFS where we need to be able to distinguish between datadev and
rtdev.
This patch fixes the problem where we screw up the dax support checking
in xfs if the datadev and rtdev have different dax capabilities.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
[rez: Re-added __bdev_dax_supported() for !CONFIG_FS_DAX cases]
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
| -rw-r--r-- | fs/xfs/xfs_super.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 39e5ec3d407f..fed63e0b8f4d 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1701,11 +1701,17 @@ xfs_fs_fill_super( sb->s_flags |= SB_I_VERSION; if (mp->m_flags & XFS_MOUNT_DAX) { + int error2 = 0; + xfs_warn(mp, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); - error = bdev_dax_supported(sb, sb->s_blocksize); - if (error) { + error = 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) { xfs_alert(mp, "DAX unsupported by block device. Turning off DAX."); mp->m_flags &= ~XFS_MOUNT_DAX; |