aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_ialloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
-rw-r--r--fs/xfs/xfs_ialloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 2f87a53f74fe..3ac5eb6bf856 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -52,7 +52,7 @@ xfs_ialloc_cluster_alignment(
52{ 52{
53 if (xfs_sb_version_hasalign(&args->mp->m_sb) && 53 if (xfs_sb_version_hasalign(&args->mp->m_sb) &&
54 args->mp->m_sb.sb_inoalignmt >= 54 args->mp->m_sb.sb_inoalignmt >=
55 XFS_B_TO_FSBT(args->mp, XFS_INODE_CLUSTER_SIZE(args->mp))) 55 XFS_B_TO_FSBT(args->mp, args->mp->m_inode_cluster_size))
56 return args->mp->m_sb.sb_inoalignmt; 56 return args->mp->m_sb.sb_inoalignmt;
57 return 1; 57 return 1;
58} 58}
@@ -181,12 +181,12 @@ xfs_ialloc_inode_init(
181 * For small block sizes, manipulate the inodes in buffers 181 * For small block sizes, manipulate the inodes in buffers
182 * which are multiples of the blocks size. 182 * which are multiples of the blocks size.
183 */ 183 */
184 if (mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp)) { 184 if (mp->m_sb.sb_blocksize >= mp->m_inode_cluster_size) {
185 blks_per_cluster = 1; 185 blks_per_cluster = 1;
186 nbufs = length; 186 nbufs = length;
187 ninodes = mp->m_sb.sb_inopblock; 187 ninodes = mp->m_sb.sb_inopblock;
188 } else { 188 } else {
189 blks_per_cluster = XFS_INODE_CLUSTER_SIZE(mp) / 189 blks_per_cluster = mp->m_inode_cluster_size /
190 mp->m_sb.sb_blocksize; 190 mp->m_sb.sb_blocksize;
191 nbufs = length / blks_per_cluster; 191 nbufs = length / blks_per_cluster;
192 ninodes = blks_per_cluster * mp->m_sb.sb_inopblock; 192 ninodes = blks_per_cluster * mp->m_sb.sb_inopblock;
@@ -1384,7 +1384,7 @@ xfs_imap(
1384 return XFS_ERROR(EINVAL); 1384 return XFS_ERROR(EINVAL);
1385 } 1385 }
1386 1386
1387 blks_per_cluster = XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_blocklog; 1387 blks_per_cluster = mp->m_inode_cluster_size >> mp->m_sb.sb_blocklog;
1388 1388
1389 /* 1389 /*
1390 * For bulkstat and handle lookups, we have an untrusted inode number 1390 * For bulkstat and handle lookups, we have an untrusted inode number
@@ -1405,7 +1405,7 @@ xfs_imap(
1405 * If the inode cluster size is the same as the blocksize or 1405 * If the inode cluster size is the same as the blocksize or
1406 * smaller we get to the buffer by simple arithmetics. 1406 * smaller we get to the buffer by simple arithmetics.
1407 */ 1407 */
1408 if (XFS_INODE_CLUSTER_SIZE(mp) <= mp->m_sb.sb_blocksize) { 1408 if (mp->m_inode_cluster_size <= mp->m_sb.sb_blocksize) {
1409 offset = XFS_INO_TO_OFFSET(mp, ino); 1409 offset = XFS_INO_TO_OFFSET(mp, ino);
1410 ASSERT(offset < mp->m_sb.sb_inopblock); 1410 ASSERT(offset < mp->m_sb.sb_inopblock);
1411 1411