| Message ID | 20191027145547.25157-10-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] xfs: remove the biosize mount option | expand |
On Sun, Oct 27, 2019 at 03:55:44PM +0100, Christoph Hellwig wrote: > Replace XFS_MOUNT_COMPAT_IOSIZE with an inverted XFS_MOUNT_LARGEIO flag > that makes the usage more clear. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Eric Sandeen <sandeen@redhat.com> Makes much more sense, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_iops.c | 2 +- > fs/xfs/xfs_mount.h | 2 +- > fs/xfs/xfs_super.c | 12 +++--------- > 3 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index 9e1f89cdcc82..18e45e3a3f9f 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -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) > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h > index e5c364f1605e..a46cb3fd24b1 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -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 */ > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index a7d89b87ed22..f21c59822a38 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -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 } > }; > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 9e1f89cdcc82..18e45e3a3f9f 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -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) diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e5c364f1605e..a46cb3fd24b1 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -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 */ diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index a7d89b87ed22..f21c59822a38 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -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 } };