diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-06-05 11:19:36 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-06-12 08:37:40 -0700 |
| commit | 4b4d98cca32053ec8993e836cb8cb7c8098959dc (patch) | |
| tree | d4c843309a573deded92ec73111faf44f97aa07a | |
| parent | 490d451fa5188975c21246f7f8f4914cd3f2d6f2 (diff) | |
| download | linux-4b4d98cca32053ec8993e836cb8cb7c8098959dc.tar.gz linux-4b4d98cca32053ec8993e836cb8cb7c8098959dc.tar.bz2 linux-4b4d98cca32053ec8993e836cb8cb7c8098959dc.zip | |
xfs: finish converting to inodes_per_cluster
Finish converting all the old inode_cluster_size >> inopblog users to
inodes_per_cluster.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
| -rw-r--r-- | fs/xfs/libxfs/xfs_inode_buf.c | 5 | ||||
| -rw-r--r-- | fs/xfs/xfs_inode.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index c1293d170d98..fd7c02ee744b 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -33,12 +33,9 @@ xfs_inobp_check( xfs_buf_t *bp) { int i; - int j; xfs_dinode_t *dip; - j = M_IGEO(mp)->inode_cluster_size >> mp->m_sb.sb_inodelog; - - for (i = 0; i < j; i++) { + for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) { dip = xfs_buf_offset(bp, i * mp->m_sb.sb_inodesize); if (!dip->di_next_unlinked) { xfs_alert(mp, diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 65eace4b8723..48756e0219fa 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3473,7 +3473,6 @@ xfs_iflush_cluster( struct xfs_mount *mp = ip->i_mount; struct xfs_perag *pag; unsigned long first_index, mask; - unsigned long inodes_per_cluster; int cilist_size; struct xfs_inode **cilist; struct xfs_inode *cip; @@ -3484,18 +3483,17 @@ xfs_iflush_cluster( pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino)); - inodes_per_cluster = igeo->inode_cluster_size >> mp->m_sb.sb_inodelog; - cilist_size = inodes_per_cluster * sizeof(xfs_inode_t *); + cilist_size = igeo->inodes_per_cluster * sizeof(struct xfs_inode *); cilist = kmem_alloc(cilist_size, KM_MAYFAIL|KM_NOFS); if (!cilist) goto out_put; - mask = ~(((igeo->inode_cluster_size >> mp->m_sb.sb_inodelog)) - 1); + mask = ~(igeo->inodes_per_cluster - 1); first_index = XFS_INO_TO_AGINO(mp, ip->i_ino) & mask; rcu_read_lock(); /* really need a gang lookup range call here */ nr_found = radix_tree_gang_lookup(&pag->pag_ici_root, (void**)cilist, - first_index, inodes_per_cluster); + first_index, igeo->inodes_per_cluster); if (nr_found == 0) goto out_free; |