noop change for userspace - just syncing with kernel source.

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 667a847d6b96bd67f1382f341f26e1287eaf226a..7908680b093426cd37f105dc9bbd68ac6de55117 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -513,8 +513,7 @@ void            xfs_inode_lock_init(xfs_inode_t *, struct vnode *);
 int            xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,
                         uint, xfs_inode_t **, xfs_daddr_t);
 int            xfs_vn_iget(struct vnode    *, struct xfs_mount *,
-                        struct xfs_trans *, xfs_ino_t,
-                        uint, xfs_inode_t **, xfs_daddr_t);
+                        xfs_ino_t, xfs_inode_t **);
 void           xfs_iput(xfs_inode_t *, uint);
 void           xfs_ilock(xfs_inode_t *, uint);
 int            xfs_ilock_nowait(xfs_inode_t *, uint);

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index b026f2005f500c3bdc1377269324409a5a31adb6..12c7528c4ae6100231205e2707692507c23ca4ee 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -351,22 +351,20 @@ typedef struct xfs_mount {
 /*
  * Default minimum read and write sizes.
  */
-#define        XFS_READIO_LOG_SMALL    15      /* <= 32MB memory */
-#define        XFS_WRITEIO_LOG_SMALL   15
-#define        XFS_READIO_LOG_LARGE    16      /* > 32MB memory */
-#define        XFS_WRITEIO_LOG_LARGE   16
+#define        XFS_READIO_LOG_LARGE    12      /* > 32MB memory */
+#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 8K because that's what was tested.
+ * is 4K because that's what was tested.
  */
 #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         13      /* 8K */
+#define XFS_MIN_IO_LOG         12      /* 4K */
 #else
 #error "Unknown page size"
 #endif