xfs: get rid of XFS_IALLOC_BLOCKS macros
PATCH v2 3/8 xfs: get rid of XFS_IALLOC_BLOCKS macros
From: Jie Liu <[email protected]>
Get rid of XFS_IALLOC_BLOCKS() marcos, use mp->m_ialloc_blks directly.
--- fs/xfs/xfs_ialloc.c | 12 ++++++------ fs/xfs/xfs_ialloc.h | 5 ----- fs/xfs/xfs_inode.c | 4 ++-- fs/xfs/xfs_log_recover.c | 4 ++-- fs/xfs/xfs_trans_resv.c | 8 ++++---- fs/xfs/xfs_trans_space.h | 2 +- 6 files changed, 15 insertions(+), 20 deletions(-)
fs/xfs/xfs_ialloc.c +6 -6
@@ -333,7 +333,7 @@ xfs_ialloc_ag_alloc(if (args.mp->m_maxicount && args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)return XFS_ERROR (ENOSPC ); - args.minlen = args.maxlen =XFS_IALLOC_BLOCKS (args.mp); + args.minlen = args.maxlen = args.mp->m_ialloc_blks;/* * First try to allocate inodes contiguous with the last-allocated * chunk of inodes. If the filesystem is striped, this will fill
@@ -343,7 +343,7 @@ xfs_ialloc_ag_alloc( newino =be32_to_cpu (agi->agi_newino); agno =be32_to_cpu (agi->agi_seqno); args.agbno =XFS_AGINO_TO_AGBNO (args.mp, newino) + -XFS_IALLOC_BLOCKS (args.mp); + args.mp->m_ialloc_blks;if (likely (newino !=NULLAGINO && (args.agbno <be32_to_cpu (agi->agi_length)))) { args.fsbno =XFS_AGB_TO_FSB (args.mp, agno, args.agbno);
@@ -585,7 +585,7 @@ xfs_ialloc_ag_select(* Is there enough free space for the file plus a block of * inodes? (if we need to allocate some)? */ - ineed =XFS_IALLOC_BLOCKS (mp); + ineed = mp->m_ialloc_blks; longest = pag->pagf_longest;if (!longest) longest = pag->pagf_flcount >0 ;
@@ -1228,9 +1228,9 @@ xfs_difree( goto error0; } -xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, - agno,XFS_INO_TO_AGBNO (mp,rec.ir_startino)), -XFS_IALLOC_BLOCKS (mp), flist, mp); +xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, agno, +XFS_INO_TO_AGBNO (mp, rec.ir_startino)), + mp->m_ialloc_blks, flist, mp); }else { *delete =0 ;
fs/xfs/xfs_ialloc.h +0 -5
@@ -25,11 +25,6 @@ struct xfs_mount;struct xfs_trans ;struct xfs_btree_cur ; -/* -* Allocation parameters for inode allocation. -*/ -#define XFS_IALLOC_BLOCKS (mp) (mp)->m_ialloc_blks -/* Move inodes in clusters of this size */ #define XFS_INODE_BIG_CLUSTER_SIZE 8192
fs/xfs/xfs_inode.c +2 -2
@@ -2155,12 +2155,12 @@ xfs_ifree_cluster(if (mp->m_sb.sb_blocksize >= mp->m_inode_cluster_size) { blks_per_cluster =1 ; ninodes = mp->m_sb.sb_inopblock; - nbufs =XFS_IALLOC_BLOCKS (mp); + 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 =XFS_IALLOC_BLOCKS (mp) / blks_per_cluster; + nbufs = mp->m_ialloc_blks / blks_per_cluster; }for (j =0 ; j < nbufs; j++, inum += ninodes) {
fs/xfs/xfs_log_recover.c +2 -2
@@ -3209,9 +3209,9 @@ xlog_recover_do_icreate_pass2(/* existing allocation is fixed value */ ASSERT (count == mp->m_ialloc_inos); -ASSERT (length ==XFS_IALLOC_BLOCKS (mp)); +ASSERT (length == mp->m_ialloc_blks);if (count != mp->m_ialloc_inos || - length !=XFS_IALLOC_BLOCKS (mp)) { + length != mp->m_ialloc_blks) {xfs_warn (log->l_mp,"xlog_recover_do_icreate_trans: bad count 2" );return EINVAL ; }
fs/xfs/xfs_trans_resv.c +4 -4
@@ -174,7 +174,7 @@ xfs_calc_itruncate_reservation(xfs_calc_buf_res (5 ,0 ) +xfs_calc_buf_res (XFS_ALLOCFREE_LOG_COUNT (mp,1 ),XFS_FSB_TO_B (mp,1 )) + -xfs_calc_buf_res (2 +XFS_IALLOC_BLOCKS (mp) + +xfs_calc_buf_res (2 + mp->m_ialloc_blks + mp->m_in_maxlevels, 0))); }
@@ -282,7 +282,7 @@ xfs_calc_create_resv_modify(* For create we can allocate some inodes giving: * the agi and agf of the ag getting the new inodes: 2 * sectorsize * the superblock for the nlink flag: sector size -* the inode blocks allocated: XFS_IALLOC_BLOCKS * blocksize +* the inode blocks allocated: mp->m_ialloc_blks * blocksize * the inode btree: max depth * blocksize * the allocation btrees: 2 trees * (max depth - 1) * block size */
@@ -292,7 +292,7 @@ xfs_calc_create_resv_alloc( {return xfs_calc_buf_res (2 , mp->m_sb.sb_sectsize) + mp->m_sb.sb_sectsize + -xfs_calc_buf_res (XFS_IALLOC_BLOCKS (mp),XFS_FSB_TO_B (mp,1 )) + +xfs_calc_buf_res (mp->m_ialloc_blks,XFS_FSB_TO_B (mp,1 )) +xfs_calc_buf_res (mp->m_in_maxlevels,XFS_FSB_TO_B (mp,1 )) +xfs_calc_buf_res (XFS_ALLOCFREE_LOG_COUNT (mp,1 ),XFS_FSB_TO_B (mp,1 ));
@@ -387,7 +387,7 @@ xfs_calc_ifree_reservation(xfs_calc_buf_res (1 ,XFS_FSB_TO_B (mp,1 )) +max_t (uint,XFS_FSB_TO_B (mp,1 ), mp->m_inode_cluster_size) +xfs_calc_buf_res (1 ,0 ) + -xfs_calc_buf_res (2 +XFS_IALLOC_BLOCKS (mp) + +xfs_calc_buf_res (2 + mp->m_ialloc_blks + mp->m_in_maxlevels,0 ) +xfs_calc_buf_res (XFS_ALLOCFREE_LOG_COUNT (mp,1 ),XFS_FSB_TO_B (mp,1 ));
fs/xfs/xfs_trans_space.h +1 -1
@@ -47,7 +47,7 @@#define XFS_DIRREMOVE_SPACE_RES (mp) \ XFS_DAREMOVE_SPACE_RES(mp, XFS_DATA_FORK)#define XFS_IALLOC_SPACE_RES (mp) \ - (XFS_IALLOC_BLOCKS(mp) + (mp)->m_in_maxlevels - 1) + ((mp)->m_ialloc_blks + (mp)->m_in_maxlevels - 1)/* * Space reservation values for various transactions.
Signature · 6 lines
1.8.3.2 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Jeff Liu
From: Jie Liu <[email protected]>
Get rid of
XFS_IALLOC_BLOCKS()marcos, usemp->m_ialloc_blksdirectly.Signed-off-by Jie Liu <[email protected]>
....
fs/xfs/xfs_ialloc.c xfs_difree( · line 1236
Quoted 13 lines
fs/xfs/xfs_ialloc.c +3
-3@@ -1228,9 +1228,9 @@ xfs_difree( goto error0; } -xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, - agno,XFS_INO_TO_AGBNO (mp,rec.ir_startino)), -XFS_IALLOC_BLOCKS (mp), flist, mp); +xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, agno, +XFS_INO_TO_AGBNO (mp, rec.ir_startino)), + mp->m_ialloc_blks, flist, mp); }else { *delete =0 ;
git-am fails to apply this hunk, but I'm not sure why. I updated it manually, the resulting patch looks identical.
Other than that, it looks good.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Jeff Liu
Reviewed-by Dave ChinnerQuoted 11 lines · Dave Chinner
Quoted 5 lines · Jeff Liu
From: Jie Liu <[email protected]>
Get rid of
XFS_IALLOC_BLOCKS()marcos, usemp->m_ialloc_blksdirectly.Signed-off-by Jie Liu <[email protected]>....
Quoted 4 lines
(quoted diff) +0
-0@@ -1228,9 +1228,9 @@ xfs_difree( goto error0; }
Quoted 12 lines
Review xfs_difree( · line 1236
Quoted 9 lines
(quoted diff) +3
-3- xfs_bmap_add_free(XFS_AGB_TO_FSB(mp, - agno, XFS_INO_TO_AGBNO(mp,rec.ir_startino)), - XFS_IALLOC_BLOCKS(mp), flist, mp); + xfs_bmap_add_free(XFS_AGB_TO_FSB(mp, agno, + XFS_INO_TO_AGBNO(mp, rec.ir_startino)), + mp->m_ialloc_blks, flist, mp); } else { *delete = 0;git-am fails to apply this hunk, but I'm not sure why. I updated it manually, the resulting patch looks identical.
Oh, I found the reason that because I failed to pull Ben's recent commits while producing this patch set, i.e,
[ xfs: fix calculation of freed inode cluster blocks ]
So below is a quick fix.
Thanks,
-Jeff
From: Jie Liu <[email protected]>
Get rid of XFS_IALLOC_BLOCKS() marcos, use mp->m_ialloc_blks directly.
--- fs/xfs/xfs_ialloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/xfs/xfs_ialloc.c +6 -6
@@ -333,7 +333,7 @@ xfs_ialloc_ag_alloc(if (args.mp->m_maxicount && args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)return XFS_ERROR (ENOSPC ); - args.minlen = args.maxlen =XFS_IALLOC_BLOCKS (args.mp); + args.minlen = args.maxlen = args.mp->m_ialloc_blks;/* * First try to allocate inodes contiguous with the last-allocated * chunk of inodes. If the filesystem is striped, this will fill
@@ -343,7 +343,7 @@ xfs_ialloc_ag_alloc( newino =be32_to_cpu (agi->agi_newino); agno =be32_to_cpu (agi->agi_seqno); args.agbno =XFS_AGINO_TO_AGBNO (args.mp, newino) + -XFS_IALLOC_BLOCKS (args.mp); + args.mp->m_ialloc_blks;if (likely (newino !=NULLAGINO && (args.agbno <be32_to_cpu (agi->agi_length)))) { args.fsbno =XFS_AGB_TO_FSB (args.mp, agno, args.agbno);
@@ -585,7 +585,7 @@ xfs_ialloc_ag_select(* Is there enough free space for the file plus a block of * inodes? (if we need to allocate some)? */ - ineed =XFS_IALLOC_BLOCKS (mp); + ineed = mp->m_ialloc_blks; longest = pag->pagf_longest;if (!longest) longest = pag->pagf_flcount >0 ;
@@ -1228,9 +1228,9 @@ xfs_difree( goto error0; } -xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, - agno,XFS_AGINO_TO_AGBNO (mp, rec.ir_startino)), -XFS_IALLOC_BLOCKS (mp), flist, mp); +xfs_bmap_add_free (XFS_AGB_TO_FSB (mp, agno, +XFS_AGINO_TO_AGBNO (mp, rec.ir_startino)), + mp->m_ialloc_blks, flist, mp); }else { *delete =0 ;
Signature · 6 lines
1.8.3.2 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs