fs/xfs: Change XFS_MOUNT_DAX to XFS_MOUNT_DAX_ALWAYS (fd58c62b) · Commits · 戴 / test

fs/xfs/xfs_iops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1248,7 +1248,7 @@ xfs_inode_supports_dax(
		return false;

		/* DAX mount option or DAX iflag must be set. */
		if (!(mp->m_flags & XFS_MOUNT_DAX) &&
		if (!(mp->m_flags & XFS_MOUNT_DAX_ALWAYS) &&
		!(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
		return false;

+1 −2

Original line number	Diff line number	Diff line
		@@ -237,8 +237,7 @@ typedef struct xfs_mount {
		#define XFS_MOUNT_FILESTREAMS (1ULL << 24) /* enable the filestreams
		allocator */
		#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */

		#define XFS_MOUNT_DAX (1ULL << 62) /* TEST ONLY! */
		#define XFS_MOUNT_DAX_ALWAYS (1ULL << 26)

		/*
		* Max and min values for mount-option defined I/O

+4 −4

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ xfs_fs_show_options(
		{ XFS_MOUNT_GRPID, ",grpid" },
		{ XFS_MOUNT_DISCARD, ",discard" },
		{ XFS_MOUNT_LARGEIO, ",largeio" },
		{ XFS_MOUNT_DAX, ",dax" },
		{ XFS_MOUNT_DAX_ALWAYS, ",dax" },
		{ 0, NULL }
		};
		struct xfs_mount *mp = XFS_M(root->d_sb);
		@@ -1261,7 +1261,7 @@ xfs_fc_parse_param(
		return 0;
		#ifdef CONFIG_FS_DAX
		case Opt_dax:
		mp->m_flags \|= XFS_MOUNT_DAX;
		mp->m_flags \|= XFS_MOUNT_DAX_ALWAYS;
		return 0;
		#endif
		default:
		@@ -1454,7 +1454,7 @@ xfs_fc_fill_super(
		if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)
		sb->s_flags \|= SB_I_VERSION;

		if (mp->m_flags & XFS_MOUNT_DAX) {
		if (mp->m_flags & XFS_MOUNT_DAX_ALWAYS) {
		bool rtdev_is_dax = false, datadev_is_dax;

		xfs_warn(mp,
		@@ -1468,7 +1468,7 @@ xfs_fc_fill_super(
		if (!rtdev_is_dax && !datadev_is_dax) {
		xfs_alert(mp,
		"DAX unsupported by block device. Turning off DAX.");
		mp->m_flags &= ~XFS_MOUNT_DAX;
		mp->m_flags &= ~XFS_MOUNT_DAX_ALWAYS;
		}
		if (xfs_sb_version_hasreflink(&mp->m_sb)) {
		xfs_alert(mp,