On Wed, Dec 11, 2013 at 09:48:27PM +0800, Jeff Liu wrote: > From: Jie Liu <jeff.liu@xxxxxxxxxx> > > Use xfs_ialloc_blks_per_cluster() in xfs_ifree_cluster() > > Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx> > --- > fs/xfs/xfs_inode.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 001aa89..7e75b8e 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -2152,16 +2152,9 @@ xfs_ifree_cluster( > struct xfs_perag *pag; > > pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, inum)); > - if (mp->m_sb.sb_blocksize >= XFS_INODE_CLUSTER_SIZE(mp)) { > - blks_per_cluster = 1; > - ninodes = mp->m_sb.sb_inopblock; > - nbufs = XFS_IALLOC_BLOCKS(mp); > - } else { > - blks_per_cluster = XFS_INODE_CLUSTER_SIZE(mp) / > - mp->m_sb.sb_blocksize; > - ninodes = blks_per_cluster * mp->m_sb.sb_inopblock; > - nbufs = XFS_IALLOC_BLOCKS(mp) / blks_per_cluster; > - } > + blks_per_cluster = xfs_ialloc_blks_per_cluster(mp); > + ninodes = blks_per_cluster << mp->m_sb.sb_inopblog; > + nbufs = XFS_IALLOC_BLOCKS(mp) / blks_per_cluster; I'd get rid of the XFS_IALLOC_BLOCKS() macros there and just use mp->m_ialloc_blks directly. Otherwise looks good. Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs