| Message ID | 20191027145547.25157-5-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:39PM +0100, Christoph Hellwig wrote: > The -o wsync allocsize overwrite overwrite was part of a special hack > for NFSv2 servers in IRIX and has no real purpose in modern Linux, so > remove it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> /me not being around to absorb any of the context of how the 15/16 shift values were arrived at notwithstanding, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_mount.c | 9 ++------- > fs/xfs/xfs_mount.h | 7 ------- > 2 files changed, 2 insertions(+), 14 deletions(-) > > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index ba5b6f3b2b88..b423033e14f4 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -438,13 +438,8 @@ xfs_set_rw_sizes(xfs_mount_t *mp) > int readio_log, writeio_log; > > if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)) { > - if (mp->m_flags & XFS_MOUNT_WSYNC) { > - readio_log = XFS_WSYNC_READIO_LOG; > - writeio_log = XFS_WSYNC_WRITEIO_LOG; > - } else { > - readio_log = XFS_READIO_LOG_LARGE; > - writeio_log = XFS_WRITEIO_LOG_LARGE; > - } > + readio_log = XFS_READIO_LOG_LARGE; > + writeio_log = XFS_WRITEIO_LOG_LARGE; > } else { > readio_log = mp->m_readio_log; > writeio_log = mp->m_writeio_log; > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h > index f69e370db341..dc81e5c264ce 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -260,13 +260,6 @@ typedef struct xfs_mount { > #define XFS_MAX_IO_LOG 30 /* 1G */ > #define XFS_MIN_IO_LOG PAGE_SHIFT > > -/* > - * Synchronous read and write sizes. This should be > - * better for NFSv2 wsync filesystems. > - */ > -#define XFS_WSYNC_READIO_LOG 15 /* 32k */ > -#define XFS_WSYNC_WRITEIO_LOG 14 /* 16k */ > - > #define XFS_LAST_UNMOUNT_WAS_CLEAN(mp) \ > ((mp)->m_flags & XFS_MOUNT_WAS_CLEAN) > #define XFS_FORCED_SHUTDOWN(mp) ((mp)->m_flags & XFS_MOUNT_FS_SHUTDOWN) > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index ba5b6f3b2b88..b423033e14f4 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -438,13 +438,8 @@ xfs_set_rw_sizes(xfs_mount_t *mp) int readio_log, writeio_log; if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)) { - if (mp->m_flags & XFS_MOUNT_WSYNC) { - readio_log = XFS_WSYNC_READIO_LOG; - writeio_log = XFS_WSYNC_WRITEIO_LOG; - } else { - readio_log = XFS_READIO_LOG_LARGE; - writeio_log = XFS_WRITEIO_LOG_LARGE; - } + readio_log = XFS_READIO_LOG_LARGE; + writeio_log = XFS_WRITEIO_LOG_LARGE; } else { readio_log = mp->m_readio_log; writeio_log = mp->m_writeio_log; diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index f69e370db341..dc81e5c264ce 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -260,13 +260,6 @@ typedef struct xfs_mount { #define XFS_MAX_IO_LOG 30 /* 1G */ #define XFS_MIN_IO_LOG PAGE_SHIFT -/* - * Synchronous read and write sizes. This should be - * better for NFSv2 wsync filesystems. - */ -#define XFS_WSYNC_READIO_LOG 15 /* 32k */ -#define XFS_WSYNC_WRITEIO_LOG 14 /* 16k */ - #define XFS_LAST_UNMOUNT_WAS_CLEAN(mp) \ ((mp)->m_flags & XFS_MOUNT_WAS_CLEAN) #define XFS_FORCED_SHUTDOWN(mp) ((mp)->m_flags & XFS_MOUNT_FS_SHUTDOWN)
The -o wsync allocsize overwrite overwrite was part of a special hack for NFSv2 servers in IRIX and has no real purpose in modern Linux, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_mount.c | 9 ++------- fs/xfs/xfs_mount.h | 7 ------- 2 files changed, 2 insertions(+), 14 deletions(-)