Commit 7c6b94b1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: reverse the polarity of XFS_MOUNT_COMPAT_IOSIZE 



Replace XFS_MOUNT_COMPAT_IOSIZE with an inverted XFS_MOUNT_LARGEIO flag
that makes the usage more clear.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 3274d008

fs/xfs/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ xfs_stat_blksize( 
	 * default buffered I/O size, return that, otherwise return the compat

	 * default.

	 */

	if (!(mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE)) {

	if (mp->m_flags & XFS_MOUNT_LARGEIO) {

		if (mp->m_swidth)

			return mp->m_swidth << mp->m_sb.sb_blocklog;

		if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ typedef struct xfs_mount { 
						 * allocation */

#define XFS_MOUNT_RDONLY	(1ULL << 20)	/* read-only fs */

#define XFS_MOUNT_DIRSYNC	(1ULL << 21)	/* synchronous directory ops */

#define XFS_MOUNT_COMPAT_IOSIZE	(1ULL << 22)	/* don't report large preferred

#define XFS_MOUNT_LARGEIO	(1ULL << 22)	/* report large preferred

						 * I/O size in stat() */

#define XFS_MOUNT_FILESTREAMS	(1ULL << 24)	/* enable the filestreams

						   allocator */

fs/xfs/xfs_super.c

+3 −9
Original line number Diff line number Diff line
@@ -180,12 +180,6 @@ xfs_parseargs( 
	if (sb->s_flags & SB_SYNCHRONOUS)

		mp->m_flags |= XFS_MOUNT_WSYNC;



	/*

	 * Set some default flags that could be cleared by the mount option

	 * parsing.

	 */

	mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;



	/*

	 * These can be overridden by the mount option parsing.

	 */
@@ -274,10 +268,10 @@ xfs_parseargs( 
			mp->m_flags &= ~XFS_MOUNT_IKEEP;

			break;

		case Opt_largeio:

			mp->m_flags &= ~XFS_MOUNT_COMPAT_IOSIZE;

			mp->m_flags |= XFS_MOUNT_LARGEIO;

			break;

		case Opt_nolargeio:

			mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;

			mp->m_flags &= ~XFS_MOUNT_LARGEIO;

			break;

		case Opt_attr2:

			mp->m_flags |= XFS_MOUNT_ATTR2;
@@ -430,12 +424,12 @@ xfs_showargs( 
		{ XFS_MOUNT_GRPID,		",grpid" },

		{ XFS_MOUNT_DISCARD,		",discard" },

		{ XFS_MOUNT_SMALL_INUMS,	",inode32" },

		{ XFS_MOUNT_LARGEIO,		",largeio" },

		{ XFS_MOUNT_DAX,		",dax" },

		{ 0, NULL }

	};

	static struct proc_xfs_info xfs_info_unset[] = {

		/* the few simple ones we can get from the mount struct */

		{ XFS_MOUNT_COMPAT_IOSIZE,	",largeio" },

		{ XFS_MOUNT_SMALL_INUMS,	",inode64" },

		{ 0, NULL }

	};