hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2019-10-28 08:41:46 -07:00 committed by Darrick J. Wong
parent 3274d00801
commit 7c6b94b1b5
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_iops.c
View File

@ -510,7 +510,7 @@ xfs_stat_blksize(
* default buffered I/O size, return that, otherwise return the compat * default buffered I/O size, return that, otherwise return the compat
* default. * default.
*/ */
if (!(mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE)) { if (mp->m_flags & XFS_MOUNT_LARGEIO) {
if (mp->m_swidth) if (mp->m_swidth)
return mp->m_swidth << mp->m_sb.sb_blocklog; return mp->m_swidth << mp->m_sb.sb_blocklog;
if (mp->m_flags & XFS_MOUNT_ALLOCSIZE) if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)

2
fs/xfs/xfs_mount.h
View File

@ -236,7 +236,7 @@ typedef struct xfs_mount {
* allocation */ * allocation */
#define XFS_MOUNT_RDONLY (1ULL << 20) /* read-only fs */ #define XFS_MOUNT_RDONLY (1ULL << 20) /* read-only fs */
#define XFS_MOUNT_DIRSYNC (1ULL << 21) /* synchronous directory ops */ #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() */ * I/O size in stat() */
#define XFS_MOUNT_FILESTREAMS (1ULL << 24) /* enable the filestreams #define XFS_MOUNT_FILESTREAMS (1ULL << 24) /* enable the filestreams
allocator */ allocator */

12
fs/xfs/xfs_super.c
View File

@ -180,12 +180,6 @@ xfs_parseargs(
if (sb->s_flags & SB_SYNCHRONOUS) if (sb->s_flags & SB_SYNCHRONOUS)
mp->m_flags |= XFS_MOUNT_WSYNC; 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. * These can be overridden by the mount option parsing.
*/ */
@ -274,10 +268,10 @@ xfs_parseargs(
mp->m_flags &= ~XFS_MOUNT_IKEEP; mp->m_flags &= ~XFS_MOUNT_IKEEP;
break; break;
case Opt_largeio: case Opt_largeio:
mp->m_flags &= ~XFS_MOUNT_COMPAT_IOSIZE; mp->m_flags |= XFS_MOUNT_LARGEIO;
break; break;
case Opt_nolargeio: case Opt_nolargeio:
mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE; mp->m_flags &= ~XFS_MOUNT_LARGEIO;
break; break;
case Opt_attr2: case Opt_attr2:
mp->m_flags |= XFS_MOUNT_ATTR2; mp->m_flags |= XFS_MOUNT_ATTR2;
@ -430,12 +424,12 @@ xfs_showargs(
{ XFS_MOUNT_GRPID, ",grpid" }, { XFS_MOUNT_GRPID, ",grpid" },
{ XFS_MOUNT_DISCARD, ",discard" }, { XFS_MOUNT_DISCARD, ",discard" },
{ XFS_MOUNT_SMALL_INUMS, ",inode32" }, { XFS_MOUNT_SMALL_INUMS, ",inode32" },
{ XFS_MOUNT_LARGEIO, ",largeio" },
{ XFS_MOUNT_DAX, ",dax" }, { XFS_MOUNT_DAX, ",dax" },
{ 0, NULL } { 0, NULL }
}; };
static struct proc_xfs_info xfs_info_unset[] = { static struct proc_xfs_info xfs_info_unset[] = {
/* the few simple ones we can get from the mount struct */ /* the few simple ones we can get from the mount struct */
{ XFS_MOUNT_COMPAT_IOSIZE, ",largeio" },
{ XFS_MOUNT_SMALL_INUMS, ",inode64" }, { XFS_MOUNT_SMALL_INUMS, ",inode64" },
{ 0, NULL } { 0, NULL }
}; };