diff mbox series

[08/12] xfs: rename the XFS_MOUNT_DFLT_IOSIZE option to XFS_MOUNT_ALLOCISZE

Message ID 20191027145547.25157-9-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [01/12] xfs: remove the biosize mount option | expand

Commit Message

Christoph Hellwig Oct. 27, 2019, 2:55 p.m. UTC 
Make the flag match the mount option and usage.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_iomap.c | 4 ++--
 fs/xfs/xfs_iops.c  | 2 +-
 fs/xfs/xfs_mount.h | 2 +-
 fs/xfs/xfs_super.c | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

Comments

Darrick J. Wong Oct. 28, 2019, 5:12 p.m. UTC | #1 
s/ALLOCISZE/ALLOCSIZE/ in the subject

On Sun, Oct 27, 2019 at 03:55:43PM +0100, Christoph Hellwig wrote:
> Make the flag match the mount option and usage.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

With that fixed,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/xfs_iomap.c | 4 ++--
>  fs/xfs/xfs_iops.c  | 2 +-
>  fs/xfs/xfs_mount.h | 2 +-
>  fs/xfs/xfs_super.c | 6 +++---
>  4 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 64bd30a24a71..3c2098f1ded0 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -390,7 +390,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;
>  
> @@ -398,7 +398,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)
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 382d72769470..9e1f89cdcc82 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -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;
>  	}
>  
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index 712dbb2039cd..e5c364f1605e 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -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 */
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 3e5002d2a79e..a7d89b87ed22 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -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);
>  
> -- 
> 2.20.1
>
Christoph Hellwig Oct. 29, 2019, 7:50 a.m. UTC | #2 
On Mon, Oct 28, 2019 at 10:12:36AM -0700, Darrick J. Wong wrote:
> s/ALLOCISZE/ALLOCSIZE/ in the subject
> 
> On Sun, Oct 27, 2019 at 03:55:43PM +0100, Christoph Hellwig wrote:
> > Make the flag match the mount option and usage.
> > 
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> With that fixed,
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

Feel free to fix up when applying the patch :)
diff mbox series

Patch

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 64bd30a24a71..3c2098f1ded0 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -390,7 +390,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;
 
@@ -398,7 +398,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)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 382d72769470..9e1f89cdcc82 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -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;
 	}
 
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 712dbb2039cd..e5c364f1605e 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -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 */
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 3e5002d2a79e..a7d89b87ed22 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -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);