diff options
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
-rw-r--r-- | fs/xfs/xfs_ialloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index 3ac5eb6bf856..eacc59c7cb80 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
@@ -333,7 +333,7 @@ xfs_ialloc_ag_alloc( | |||
333 | if (args.mp->m_maxicount && | 333 | if (args.mp->m_maxicount && |
334 | args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount) | 334 | args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount) |
335 | return XFS_ERROR(ENOSPC); | 335 | return XFS_ERROR(ENOSPC); |
336 | args.minlen = args.maxlen = XFS_IALLOC_BLOCKS(args.mp); | 336 | args.minlen = args.maxlen = args.mp->m_ialloc_blks; |
337 | /* | 337 | /* |
338 | * First try to allocate inodes contiguous with the last-allocated | 338 | * First try to allocate inodes contiguous with the last-allocated |
339 | * chunk of inodes. If the filesystem is striped, this will fill | 339 | * chunk of inodes. If the filesystem is striped, this will fill |
@@ -343,7 +343,7 @@ xfs_ialloc_ag_alloc( | |||
343 | newino = be32_to_cpu(agi->agi_newino); | 343 | newino = be32_to_cpu(agi->agi_newino); |
344 | agno = be32_to_cpu(agi->agi_seqno); | 344 | agno = be32_to_cpu(agi->agi_seqno); |
345 | args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) + | 345 | args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) + |
346 | XFS_IALLOC_BLOCKS(args.mp); | 346 | args.mp->m_ialloc_blks; |
347 | if (likely(newino != NULLAGINO && | 347 | if (likely(newino != NULLAGINO && |
348 | (args.agbno < be32_to_cpu(agi->agi_length)))) { | 348 | (args.agbno < be32_to_cpu(agi->agi_length)))) { |
349 | args.fsbno = XFS_AGB_TO_FSB(args.mp, agno, args.agbno); | 349 | args.fsbno = XFS_AGB_TO_FSB(args.mp, agno, args.agbno); |
@@ -585,7 +585,7 @@ xfs_ialloc_ag_select( | |||
585 | * Is there enough free space for the file plus a block of | 585 | * Is there enough free space for the file plus a block of |
586 | * inodes? (if we need to allocate some)? | 586 | * inodes? (if we need to allocate some)? |
587 | */ | 587 | */ |
588 | ineed = XFS_IALLOC_BLOCKS(mp); | 588 | ineed = mp->m_ialloc_blks; |
589 | longest = pag->pagf_longest; | 589 | longest = pag->pagf_longest; |
590 | if (!longest) | 590 | if (!longest) |
591 | longest = pag->pagf_flcount > 0; | 591 | longest = pag->pagf_flcount > 0; |
@@ -1228,9 +1228,9 @@ xfs_difree( | |||
1228 | goto error0; | 1228 | goto error0; |
1229 | } | 1229 | } |
1230 | 1230 | ||
1231 | xfs_bmap_add_free(XFS_AGB_TO_FSB(mp, | 1231 | xfs_bmap_add_free(XFS_AGB_TO_FSB(mp, agno, |
1232 | agno, XFS_AGINO_TO_AGBNO(mp, rec.ir_startino)), | 1232 | XFS_AGINO_TO_AGBNO(mp, rec.ir_startino)), |
1233 | XFS_IALLOC_BLOCKS(mp), flist, mp); | 1233 | mp->m_ialloc_blks, flist, mp); |
1234 | } else { | 1234 | } else { |
1235 | *delete = 0; | 1235 | *delete = 0; |
1236 | 1236 | ||