xfs: don't use a different allocsice for -o wsync

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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index ba5b6f3b2b88a13cf79b33cab58270db8075585d..b423033e14f4fece6cb12a2ab4258fdbf96c71c3 100644 (file)
--- 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 f69e370db341dca7357a91ada58edcd144bbdf02..dc81e5c264ce8ca38d110dc3fe5102583af837ff 100644 (file)
--- 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)