lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: get rid of XFS_IALLOC_INODES macros

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

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Jie Liu
2013-12-13 15:51:46 +11:00
committed by Dave Chinner
parent f9b395a8ef
commit 717834383c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/xfs/xfs_ialloc.c
View File

@@ -225,7 +225,7 @@ xfs_ialloc_inode_init(
* they track in the AIL as if they were physically logged. * they track in the AIL as if they were physically logged.
*/ */
if (tp) 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); mp->m_sb.sb_inodesize, length, gen);
} else if (xfs_sb_version_hasnlink(&mp->m_sb)) } else if (xfs_sb_version_hasnlink(&mp->m_sb))
version = 2; version = 2;
@@ -329,7 +329,7 @@ xfs_ialloc_ag_alloc(
* Locking will ensure that we don't have two callers in here * Locking will ensure that we don't have two callers in here
* at one time. * at one time.
*/ */
newlen = XFS_IALLOC_INODES(args.mp); newlen = args.mp->m_ialloc_inos;
if (args.mp->m_maxicount && if (args.mp->m_maxicount &&
args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount) args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)
return XFS_ERROR(ENOSPC); return XFS_ERROR(ENOSPC);
@@ -999,7 +999,7 @@ xfs_dialloc(
* inode. * inode.
*/ */
if (mp->m_maxicount && 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; noroom = 1;
okalloc = 0; okalloc = 0;
} }
@@ -1202,7 +1202,7 @@ xfs_difree(
* When an inode cluster is free, it becomes eligible for removal * When an inode cluster is free, it becomes eligible for removal
*/ */
if (!(mp->m_flags & XFS_MOUNT_IKEEP) && if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&
(rec.ir_freecount == XFS_IALLOC_INODES(mp))) { (rec.ir_freecount == mp->m_ialloc_inos)) {
*delete = 1; *delete = 1;
*first_ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino); *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 * AGI and Superblock inode counts, and mark the disk space
* to be freed when the transaction is committed. * 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_count, -ilen);
be32_add_cpu(&agi->agi_freecount, -(ilen - 1)); be32_add_cpu(&agi->agi_freecount, -(ilen - 1));
xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); 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 */ /* check that the returned record contains the required inode */
if (rec.ir_startino > agino || if (rec.ir_startino > agino ||
rec.ir_startino + XFS_IALLOC_INODES(mp) <= agino) rec.ir_startino + mp->m_ialloc_inos <= agino)
return EINVAL; return EINVAL;
/* for untrusted inodes check it is allocated first */ /* for untrusted inodes check it is allocated first */

1
fs/xfs/xfs_ialloc.h
View File

@@ -28,7 +28,6 @@ struct xfs_btree_cur;
/* /*
* Allocation parameters for inode allocation. * Allocation parameters for inode allocation.
*/ */
#define XFS_IALLOC_INODES(mp) (mp)->m_ialloc_inos
#define XFS_IALLOC_BLOCKS(mp) (mp)->m_ialloc_blks #define XFS_IALLOC_BLOCKS(mp) (mp)->m_ialloc_blks
/* /*

4
fs/xfs/xfs_log_recover.c
View File

@@ -3208,9 +3208,9 @@ xlog_recover_do_icreate_pass2(
} }
/* existing allocation is fixed value */ /* existing allocation is fixed value */
ASSERT(count == XFS_IALLOC_INODES(mp)); ASSERT(count == mp->m_ialloc_inos);
ASSERT(length == XFS_IALLOC_BLOCKS(mp)); ASSERT(length == XFS_IALLOC_BLOCKS(mp));
if (count != XFS_IALLOC_INODES(mp) || if (count != mp->m_ialloc_inos ||
length != XFS_IALLOC_BLOCKS(mp)) { length != XFS_IALLOC_BLOCKS(mp)) {
xfs_warn(log->l_mp, "xlog_recover_do_icreate_trans: bad count 2"); xfs_warn(log->l_mp, "xlog_recover_do_icreate_trans: bad count 2");
return EINVAL; return EINVAL;