mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
490d451fa5
commit
4b4d98cca3
2 changed files with 4 additions and 9 deletions
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue