Merge of xfs-cmds-2.4.18:slinx:112528a by nathans.

  remove several no-longer-used fields (iosize) from the xfs_iocore_t.

diff --git a/include/xfs_fs.h b/include/xfs_fs.h
index d5a7e19c586e953f125803901f1128b532a23070..6ae752edf22096d47e38d21f4e25b97fc53ae3e9 100644 (file)
--- a/include/xfs_fs.h
+++ b/include/xfs_fs.h
@@ -44,14 +44,6 @@
 #define XFS_SUPER_MAGIC 0x58465342
 #define XFS_NAME       "xfs"
 
-struct biosize {
-       __u32           biosz_flags;
-       __s32           biosz_read;
-       __s32           biosz_write;
-       __s32           dfl_biosz_read;
-       __s32           dfl_biosz_write;
-};
-       
 /* 
  * Direct I/O attribute record used with XFS_IOC_DIOINFO
  * d_miniosz is the min xfer size, xfer size multiple and file seek offset
@@ -433,8 +425,8 @@ typedef struct xfs_handle {
 #define        XFS_IOC_UNRESVSP64      _IOW ('X', 43, struct xfs_flock64)
 #define        XFS_IOC_GETBMAPA        _IOWR('X', 44, struct getbmap)
 #define        XFS_IOC_FSGETXATTRA     _IOR ('X', 45, struct fsxattr)
-#define        XFS_IOC_SETBIOSIZE      _IOW ('X', 46, struct biosize)
-#define        XFS_IOC_GETBIOSIZE      _IOR ('X', 47, struct biosize)
+/*      XFS_IOC_SETBIOSIZE ---- deprecated 46      */
+/*      XFS_IOC_GETBIOSIZE ---- deprecated 47      */
 #define        XFS_IOC_GETBMAPX        _IOWR('X', 56, struct getbmap)
 
 /*

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 8a75f34b7230202696870c7e7b636b518e8ef76f..7adfe4c6cce44f877f34c1bf1b5c675e097560de 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -152,11 +152,6 @@ typedef struct xfs_iocore {
 
        /* I/O state */
        xfs_fsize_t             io_new_size;    /* sz when write completes */
-       unsigned int            io_readio_blocks;       /* read buffer size */
-       unsigned int            io_writeio_blocks;      /* write buffer size */
-       uchar_t                 io_readio_log;  /* log2 of read buffer size */
-       uchar_t                 io_writeio_log; /* log2 of write buffer size */
-       uchar_t                 io_max_io_log;  /* max r/w io value */
        int                     io_queued_bufs; /* count of xfsd queued bufs*/
 
        /* Miscellaneous state. */
@@ -180,7 +175,6 @@ typedef struct xfs_iocore {
 #define XFS_IOCORE_ISXFS       0x01
 #define XFS_IOCORE_ISCXFS      0x02
 #define XFS_IOCORE_RT          0x04
-#define XFS_IOCORE_UIOSZ       0x08
 
 #define IO_IS_XFS(io)  ((io)->io_flags & XFS_IOCORE_ISXFS)
 

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 8b6bed30e85b112cd0a3d0351ee37cbf1d43d3ba..2c859d331ce8935c505477f81bb8437501b75cc0 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -366,20 +366,11 @@ typedef struct xfs_mount {
 #define        XFS_WRITEIO_LOG_LARGE   12
 
 /*
- * max and min values for UIO and mount-option defined I/O sizes
- * min value can't be less than a page.  Lower limit for 4K machines
- * is 4K because that's what was tested.
+ * Max and min values for UIO and mount-option defined I/O sizes;
+ * min value can't be less than a page.  Currently unused.
  */
 #define XFS_MAX_IO_LOG         16      /* 64K */
-
-#if (_PAGESZ == 16384) || (_PAGESZ == 8192)
-#define XFS_MIN_IO_LOG         14      /* 16K */
-#elif _PAGESZ == 4096
-#define XFS_MIN_IO_LOG         12      /* 4K */
-#else
-#error "Unknown page size"
-#endif
-
+#define XFS_MIN_IO_LOG         PAGE_SHIFT
 
 /*
  * Synchronous read and write sizes.  This should be