xfs: use xfs_icluster_size_fsb in xfs_ifree_cluster

Use xfs_icluster_size_fsb() in xfs_ifree_cluster(), rename variable
ninodes to inodes_per_cluster, the latter is more meaningful.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 0c8c334f0f15a95050a4bdda6c5f54389c8f7080..833028cf205f468e005f8953a780346ffb2734a3 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2141,8 +2141,8 @@ xfs_ifree_cluster(
 {
        xfs_mount_t             *mp = free_ip->i_mount;
        int                     blks_per_cluster;
+       int                     inodes_per_cluster;
        int                     nbufs;
-       int                     ninodes;
        int                     i, j;
        xfs_daddr_t             blkno;
        xfs_buf_t               *bp;
@@ -2152,18 +2152,11 @@ xfs_ifree_cluster(
        struct xfs_perag        *pag;
 
        pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, inum));
-       if (mp->m_sb.sb_blocksize >= mp->m_inode_cluster_size) {
-               blks_per_cluster = 1;
-               ninodes = mp->m_sb.sb_inopblock;
-               nbufs = mp->m_ialloc_blks;
-       } else {
-               blks_per_cluster = mp->m_inode_cluster_size /
-                                  mp->m_sb.sb_blocksize;
-               ninodes = blks_per_cluster * mp->m_sb.sb_inopblock;
-               nbufs = mp->m_ialloc_blks / blks_per_cluster;
-       }
+       blks_per_cluster = xfs_icluster_size_fsb(mp);
+       inodes_per_cluster = blks_per_cluster << mp->m_sb.sb_inopblog;
+       nbufs = mp->m_ialloc_blks / blks_per_cluster;
 
-       for (j = 0; j < nbufs; j++, inum += ninodes) {
+       for (j = 0; j < nbufs; j++, inum += inodes_per_cluster) {
                blkno = XFS_AGB_TO_DADDR(mp, XFS_INO_TO_AGNO(mp, inum),
                                         XFS_INO_TO_AGBNO(mp, inum));
 
@@ -2225,7 +2218,7 @@ xfs_ifree_cluster(
                 * transaction stale above, which means there is no point in
                 * even trying to lock them.
                 */
-               for (i = 0; i < ninodes; i++) {
+               for (i = 0; i < inodes_per_cluster; i++) {
 retry:
                        rcu_read_lock();
                        ip = radix_tree_lookup(&pag->pag_ici_root,