xfs: get rid of XFS_IALLOC_INODES macros
PATCH v2 1/8 xfs: get rid of XFS_IALLOC_INODES macros
From: Jie Liu <[email protected]>
Get rid of XFS_IALLOC_INODES() marcos, use mp->m_ialloc_inos directly.
Signed-off-by Jie Liu <[email protected]>
--- fs/xfs/xfs_ialloc.c | 12 ++++++------ fs/xfs/xfs_ialloc.h | 1 - fs/xfs/xfs_log_recover.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-)
fs/xfs/xfs_ialloc.c +6 -6
@@ -225,7 +225,7 @@ xfs_ialloc_inode_init(* they track in the AIL as if they were physically logged. */ if (tp) -xfs_icreate_log (tp, agno, agbno,XFS_IALLOC_INODES (mp), +xfs_icreate_log (tp, agno, agbno, mp->m_ialloc_inos, mp->m_sb.sb_inodesize, length, gen); }else if (xfs_sb_version_hasnlink (&mp->m_sb)) version =2 ;
@@ -329,7 +329,7 @@ xfs_ialloc_ag_alloc(* Locking will ensure that we don't have two callers in here * at one time. */ - newlen =XFS_IALLOC_INODES (args.mp); + newlen = args.mp->m_ialloc_inos;if (args.mp->m_maxicount && args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)return XFS_ERROR (ENOSPC );
@@ -999,7 +999,7 @@ xfs_dialloc(* inode. */ if (mp->m_maxicount && - mp->m_sb.sb_icount +XFS_IALLOC_INODES (mp) > mp->m_maxicount) { + mp->m_sb.sb_icount + mp->m_ialloc_inos > mp->m_maxicount) { noroom =1 ; okalloc =0 ; }
@@ -1202,7 +1202,7 @@ xfs_difree(* When an inode cluster is free, it becomes eligible for removal */ if (!(mp->m_flags &XFS_MOUNT_IKEEP ) && - (rec.ir_freecount ==XFS_IALLOC_INODES (mp))) { + (rec.ir_freecount == mp->m_ialloc_inos)) { *delete =1 ; *first_ino =XFS_AGINO_TO_INO (mp, agno, rec.ir_startino);
@@ -1212,7 +1212,7 @@ xfs_difree(* AGI and Superblock inode counts, and mark the disk space * to be freed when the transaction is committed. */ - ilen =XFS_IALLOC_INODES (mp); + ilen = mp->m_ialloc_inos;be32_add_cpu (&agi->agi_count, -ilen);be32_add_cpu (&agi->agi_freecount, -(ilen -1 ));xfs_ialloc_log_agi (tp, agbp,XFS_AGI_COUNT |XFS_AGI_FREECOUNT );
@@ -1311,7 +1311,7 @@ xfs_imap_lookup(/* check that the returned record contains the required inode */ if (rec.ir_startino > agino || - rec.ir_startino +XFS_IALLOC_INODES (mp) <= agino) + rec.ir_startino + mp->m_ialloc_inos <= agino)return EINVAL ;/* for untrusted inodes check it is allocated first */
fs/xfs/xfs_ialloc.h +0 -1
@@ -28,7 +28,6 @@ struct xfs_btree_cur;/* * Allocation parameters for inode allocation. */ -#define XFS_IALLOC_INODES (mp) (mp)->m_ialloc_inos#define XFS_IALLOC_BLOCKS (mp) (mp)->m_ialloc_blks/*
fs/xfs/xfs_log_recover.c +2 -2
@@ -3208,9 +3208,9 @@ xlog_recover_do_icreate_pass2( }/* existing allocation is fixed value */ -ASSERT (count ==XFS_IALLOC_INODES (mp)); +ASSERT (count == mp->m_ialloc_inos);ASSERT (length ==XFS_IALLOC_BLOCKS (mp)); -if (count !=XFS_IALLOC_INODES (mp) || +if (count != mp->m_ialloc_inos || length !=XFS_IALLOC_BLOCKS (mp)) {xfs_warn (log->l_mp,"xlog_recover_do_icreate_trans: bad count 2" );return EINVAL ;
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_INODES()marcos, usemp->m_ialloc_inosdirectly.Signed-off-by Jie Liu <[email protected]>
Looks good.
Reviewed-by Dave Chinner <[email protected]>
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs