Commit 5da8a07c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: rename the m_writeio_* fields in struct xfs_mount 



Use the allocsize name to match the mount option and usage instead.

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 3cd1d18b

fs/xfs/xfs_iomap.c

+8 −8
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
#include "xfs_reflink.h"





#define XFS_WRITEIO_ALIGN(mp,off)	(((off) >> mp->m_writeio_log) \

						<< mp->m_writeio_log)

#define XFS_ALLOC_ALIGN(mp, off) \

	(((off) >> mp->m_allocsize_log) << mp->m_allocsize_log)



static int

xfs_alert_fsblock_zero(
@@ -422,7 +422,7 @@ xfs_iomap_prealloc_size( 
		return 0;



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

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

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

		return 0;



	/*
@@ -433,7 +433,7 @@ xfs_iomap_prealloc_size( 
	    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)

		return mp->m_writeio_blocks;

		return mp->m_allocsize_blocks;



	/*

	 * Determine the initial size of the preallocation. We are beyond the
@@ -526,10 +526,10 @@ xfs_iomap_prealloc_size( 
	while (alloc_blocks && alloc_blocks >= freesp)

		alloc_blocks >>= 4;

check_writeio:

	if (alloc_blocks < mp->m_writeio_blocks)

		alloc_blocks = mp->m_writeio_blocks;

	if (alloc_blocks < mp->m_allocsize_blocks)

		alloc_blocks = mp->m_allocsize_blocks;

	trace_xfs_iomap_prealloc_size(ip, alloc_blocks, shift,

				      mp->m_writeio_blocks);

				      mp->m_allocsize_blocks);

	return alloc_blocks;

}
@@ -991,7 +991,7 @@ xfs_buffered_write_iomap_begin( 
			xfs_off_t	end_offset;

			xfs_fileoff_t	p_end_fsb;



			end_offset = XFS_WRITEIO_ALIGN(mp, offset + count - 1);

			end_offset = XFS_ALLOC_ALIGN(mp, offset + count - 1);

			p_end_fsb = XFS_B_TO_FSBT(mp, end_offset) +

					prealloc_blocks;

fs/xfs/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ xfs_stat_blksize( 
		if (mp->m_swidth)

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

		if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)

			return 1U << mp->m_writeio_log;

			return 1U << mp->m_allocsize_log;

	}



	return PAGE_SIZE;

fs/xfs/xfs_mount.c

+4 −4
Original line number Diff line number Diff line
@@ -440,13 +440,13 @@ xfs_set_rw_sizes(xfs_mount_t *mp) 
	if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE))

		writeio_log = XFS_WRITEIO_LOG_LARGE;

	else

		writeio_log = mp->m_writeio_log;

		writeio_log = mp->m_allocsize_log;



	if (sbp->sb_blocklog > writeio_log)

		mp->m_writeio_log = sbp->sb_blocklog;

		mp->m_allocsize_log = sbp->sb_blocklog;

	} else

		mp->m_writeio_log = writeio_log;

	mp->m_writeio_blocks = 1 << (mp->m_writeio_log - sbp->sb_blocklog);

		mp->m_allocsize_log = writeio_log;

	mp->m_allocsize_blocks = 1 << (mp->m_allocsize_log - sbp->sb_blocklog);

}



/*

fs/xfs/xfs_mount.h

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ typedef struct xfs_mount { 
	xfs_agnumber_t		m_agirotor;	/* last ag dir inode alloced */

	spinlock_t		m_agirotor_lock;/* .. and lock protecting it */

	xfs_agnumber_t		m_maxagi;	/* highest inode alloc group */

	uint			m_writeio_log;	/* min write size log bytes */

	uint			m_writeio_blocks; /* min write size blocks */

	uint			m_allocsize_log;/* min write size log bytes */

	uint			m_allocsize_blocks; /* min write size blocks */

	struct xfs_da_geometry	*m_dir_geo;	/* directory block geometry */

	struct xfs_da_geometry	*m_attr_geo;	/* attribute block geometry */

	struct xlog		*m_log;		/* log specific stuff */

fs/xfs/xfs_super.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ xfs_parseargs( 
		}



		mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;

		mp->m_writeio_log = iosizelog;

		mp->m_allocsize_log = iosizelog;

	}



	return 0;
@@ -456,7 +456,7 @@ xfs_showargs( 


	if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)

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

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

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



	if (mp->m_logbufs > 0)

		seq_printf(m, ",logbufs=%d", mp->m_logbufs);