aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorJie Liu <jeff.liu@oracle.com>2013-12-12 23:51:48 -0500
committerDave Chinner <david@fromorbit.com>2013-12-12 23:51:48 -0500
commit0f49efd805229fc747761213ec820c1ba3ab64db (patch)
tree3871d59b2ff50e3c9226b679ddd3d7d3bf7fb57d /fs/xfs/xfs_log_recover.c
parent717834383c6ad2173323b823b97c521c9fb8fbbb (diff)
xfs: get rid of XFS_INODE_CLUSTER_SIZE macros
Get rid of XFS_INODE_CLUSTER_SIZE() macros, use mp->m_inode_cluster_size directly. Signed-off-by: Jie Liu <jeff.liu@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r--fs/xfs/xfs_log_recover.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index f76de2eadb6d..42458ab7a336 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2523,19 +2523,19 @@ xlog_recover_buffer_pass2(
2523 * 2523 *
2524 * Also make sure that only inode buffers with good sizes stay in 2524 * Also make sure that only inode buffers with good sizes stay in
2525 * the buffer cache. The kernel moves inodes in buffers of 1 block 2525 * the buffer cache. The kernel moves inodes in buffers of 1 block
2526 * or XFS_INODE_CLUSTER_SIZE bytes, whichever is bigger. The inode 2526 * or mp->m_inode_cluster_size bytes, whichever is bigger. The inode
2527 * buffers in the log can be a different size if the log was generated 2527 * buffers in the log can be a different size if the log was generated
2528 * by an older kernel using unclustered inode buffers or a newer kernel 2528 * by an older kernel using unclustered inode buffers or a newer kernel
2529 * running with a different inode cluster size. Regardless, if the 2529 * running with a different inode cluster size. Regardless, if the
2530 * the inode buffer size isn't MAX(blocksize, XFS_INODE_CLUSTER_SIZE) 2530 * the inode buffer size isn't MAX(blocksize, mp->m_inode_cluster_size)
2531 * for *our* value of XFS_INODE_CLUSTER_SIZE, then we need to keep 2531 * for *our* value of mp->m_inode_cluster_size, then we need to keep
2532 * the buffer out of the buffer cache so that the buffer won't 2532 * the buffer out of the buffer cache so that the buffer won't
2533 * overlap with future reads of those inodes. 2533 * overlap with future reads of those inodes.
2534 */ 2534 */
2535 if (XFS_DINODE_MAGIC == 2535 if (XFS_DINODE_MAGIC ==
2536 be16_to_cpu(*((__be16 *)xfs_buf_offset(bp, 0))) && 2536 be16_to_cpu(*((__be16 *)xfs_buf_offset(bp, 0))) &&
2537 (BBTOB(bp->b_io_length) != MAX(log->l_mp->m_sb.sb_blocksize, 2537 (BBTOB(bp->b_io_length) != MAX(log->l_mp->m_sb.sb_blocksize,
2538 (__uint32_t)XFS_INODE_CLUSTER_SIZE(log->l_mp)))) { 2538 (__uint32_t)log->l_mp->m_inode_cluster_size))) {
2539 xfs_buf_stale(bp); 2539 xfs_buf_stale(bp);
2540 error = xfs_bwrite(bp); 2540 error = xfs_bwrite(bp);
2541 } else { 2541 } else {