Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71783438 authored by Jie Liu's avatar Jie Liu Committed by Dave Chinner
Browse files

xfs: get rid of XFS_IALLOC_INODES macros 



Get rid of XFS_IALLOC_INODES() marcos, use mp->m_ialloc_inos directly.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent f9b395a8

fs/xfs/xfs_ialloc.c

+6 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;