Commit 982e939e authored by Jie Liu's avatar Jie Liu Committed by Dave Chinner

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: default avatarJie Liu <jeff.liu@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 6e0c7b8c
...@@ -2141,8 +2141,8 @@ xfs_ifree_cluster( ...@@ -2141,8 +2141,8 @@ xfs_ifree_cluster(
{ {
xfs_mount_t *mp = free_ip->i_mount; xfs_mount_t *mp = free_ip->i_mount;
int blks_per_cluster; int blks_per_cluster;
int inodes_per_cluster;
int nbufs; int nbufs;
int ninodes;
int i, j; int i, j;
xfs_daddr_t blkno; xfs_daddr_t blkno;
xfs_buf_t *bp; xfs_buf_t *bp;
...@@ -2152,18 +2152,11 @@ xfs_ifree_cluster( ...@@ -2152,18 +2152,11 @@ xfs_ifree_cluster(
struct xfs_perag *pag; struct xfs_perag *pag;
pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, inum)); 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 = xfs_icluster_size_fsb(mp);
blks_per_cluster = 1; inodes_per_cluster = blks_per_cluster << mp->m_sb.sb_inopblog;
ninodes = mp->m_sb.sb_inopblock; nbufs = mp->m_ialloc_blks / blks_per_cluster;
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;
}
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), blkno = XFS_AGB_TO_DADDR(mp, XFS_INO_TO_AGNO(mp, inum),
XFS_INO_TO_AGBNO(mp, inum)); XFS_INO_TO_AGBNO(mp, inum));
...@@ -2225,7 +2218,7 @@ xfs_ifree_cluster( ...@@ -2225,7 +2218,7 @@ xfs_ifree_cluster(
* transaction stale above, which means there is no point in * transaction stale above, which means there is no point in
* even trying to lock them. * even trying to lock them.
*/ */
for (i = 0; i < ninodes; i++) { for (i = 0; i < inodes_per_cluster; i++) {
retry: retry:
rcu_read_lock(); rcu_read_lock();
ip = radix_tree_lookup(&pag->pag_ici_root, ip = radix_tree_lookup(&pag->pag_ici_root,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment