[XFS] Pick a single default inode cluster size.

Remove scaling of inode "clusters" based on machine memory; small cluster
cut-point was an unrealistic 32MB and was probably never tested.

Removes another user of xfs_physmem.

SGI-PV: 968563
SGI-Modid: xfs-linux-melb:xfs-kern:29324a

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h
index 97f4040931cad6b354d7f91e771899be3b95ffaf..4e30ec1d13bc35b3fd3af4b0b0ad50bde967ad58 100644 (file)
--- a/fs/xfs/xfs_ialloc.h
+++ b/fs/xfs/xfs_ialloc.h
@@ -30,14 +30,9 @@ struct xfs_trans;
 #define        XFS_IALLOC_BLOCKS(mp)   (mp)->m_ialloc_blks
 
 /*
- * For small block file systems, move inodes in clusters of this size.
- * When we don't have a lot of memory, however, we go a bit smaller
- * to reduce the number of AGI and ialloc btree blocks we need to keep
- * around for xfs_dilocate().  We choose which one to use in
- * xfs_mount_int().
+ * Move inodes in clusters of this size.
  */
 #define        XFS_INODE_BIG_CLUSTER_SIZE      8192
-#define        XFS_INODE_SMALL_CLUSTER_SIZE    4096
 #define        XFS_INODE_CLUSTER_SIZE(mp)      (mp)->m_inode_cluster_size
 
 /*

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 4458e706b1c6ec1a905b0ea597579b28434b61ff..cfe4de5def897de9fdb314183820c8d3c444373b 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -885,15 +885,12 @@ xfs_mountfs(
        mp->m_writeio_blocks = 1 << (mp->m_writeio_log - sbp->sb_blocklog);
 
        /*
-        * Set the inode cluster size based on the physical memory
-        * size.  This may still be overridden by the file system
+        * Set the inode cluster size.
+        * This may still be overridden by the file system
         * block size if it is larger than the chosen cluster size.
         */
-       if (xfs_physmem <= btoc(32 * 1024 * 1024)) { /* <= 32 MB */
-               mp->m_inode_cluster_size = XFS_INODE_SMALL_CLUSTER_SIZE;
-       } else {
-               mp->m_inode_cluster_size = XFS_INODE_BIG_CLUSTER_SIZE;
-       }
+       mp->m_inode_cluster_size = XFS_INODE_BIG_CLUSTER_SIZE;
+
        /*
         * Set whether we're using inode alignment.
         */