Commit 3274d008 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: rename the XFS_MOUNT_DFLT_IOSIZE option to 



Make the flag match the mount option and usage.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 2fcddee8

fs/xfs/xfs_iomap.c

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ xfs_iomap_prealloc_size( 
	if (offset + count <= XFS_ISIZE(ip))

		return 0;



	if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) &&

	if (!(mp->m_flags & XFS_MOUNT_ALLOCSIZE) &&

	    (XFS_ISIZE(ip) < XFS_FSB_TO_B(mp, mp->m_allocsize_blocks)))

		return 0;
@@ -429,7 +429,7 @@ xfs_iomap_prealloc_size( 
	 * If an explicit allocsize is set, the file is small, or we

	 * are writing behind a hole, then use the minimum prealloc:

	 */

	if ((mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) ||

	if ((mp->m_flags & XFS_MOUNT_ALLOCSIZE) ||

	    XFS_ISIZE(ip) < XFS_FSB_TO_B(mp, mp->m_dalign) ||

	    !xfs_iext_peek_prev_extent(ifp, icur, &prev) ||

	    prev.br_startoff + prev.br_blockcount < offset_fsb)

fs/xfs/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ xfs_stat_blksize( 
	if (!(mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE)) {

		if (mp->m_swidth)

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

		if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)

		if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)

			return 1U << mp->m_allocsize_log;

	}

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ typedef struct xfs_mount { 
#define XFS_MOUNT_ATTR2		(1ULL << 8)	/* allow use of attr2 format */

#define XFS_MOUNT_GRPID		(1ULL << 9)	/* group-ID assigned from directory */

#define XFS_MOUNT_NORECOVERY	(1ULL << 10)	/* no recovery - dirty fs */

#define XFS_MOUNT_DFLT_IOSIZE	(1ULL << 12)	/* set default i/o size */

#define XFS_MOUNT_ALLOCSIZE	(1ULL << 12)	/* specified allocation size */

#define XFS_MOUNT_SMALL_INUMS	(1ULL << 14)	/* user wants 32bit inodes */

#define XFS_MOUNT_32BITINODES	(1ULL << 15)	/* inode32 allocator active */

#define XFS_MOUNT_NOUUID	(1ULL << 16)	/* ignore uuid during mount */

fs/xfs/xfs_super.c

+3 −3
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ xfs_parseargs( 
			if (suffix_kstrtoint(args, 10, &size))

				return -EINVAL;

			mp->m_allocsize_log = ffs(size) - 1;

			mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;

			mp->m_flags |= XFS_MOUNT_ALLOCSIZE;

			break;

		case Opt_grpid:

		case Opt_bsdgroups:
@@ -396,7 +396,7 @@ xfs_parseargs( 
		return -EINVAL;

	}



	if ((mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) &&

	if ((mp->m_flags & XFS_MOUNT_ALLOCSIZE) &&

	    (mp->m_allocsize_log > XFS_MAX_IO_LOG ||

	     mp->m_allocsize_log < XFS_MIN_IO_LOG)) {

		xfs_warn(mp, "invalid log iosize: %d [not %d-%d]",
@@ -450,7 +450,7 @@ xfs_showargs( 
			seq_puts(m, xfs_infop->str);

	}



	if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)

	if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)

		seq_printf(m, ",allocsize=%dk",

				(int)(1 << mp->m_allocsize_log) >> 10);