xfs
[Top] [All Lists]

[PATCH 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster

To: "xfs@xxxxxxxxxxx" <xfs@xxxxxxxxxxx>
Subject: [PATCH 4/5] xfs: use xfs_ialloc_blks_per_cluster in xfs_ifree_cluster
From: Jeff Liu <jeff.liu@xxxxxxxxxx>
Date: Wed, 11 Dec 2013 21:48:27 +0800
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0
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;
 
        for (j = 0; j < nbufs; j++, inum += ninodes) {
                blkno = XFS_AGB_TO_DADDR(mp, XFS_INO_TO_AGNO(mp, inum),
-- 
1.8.3.2

<Prev in Thread] Current Thread [Next in Thread>