xfs
[Top] [All Lists]

[PATCH 3/4] xfs: set xfs_initialize_perag() to use xfs_set_inode32/64()

To: xfs@xxxxxxxxxxx
Subject: [PATCH 3/4] xfs: set xfs_initialize_perag() to use xfs_set_inode32/64()
From: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Date: Fri, 14 Sep 2012 13:49:40 -0300
In-reply-to: <1347641381-30050-1-git-send-email-cmaiolino@xxxxxxxxxx>
References: <1347641381-30050-1-git-send-email-cmaiolino@xxxxxxxxxx>
Set xfs_initialize_perag() to use xfs_set_inode32() and xfs_set_inode64()
functions, removing duplicated code

Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
---
 fs/xfs/xfs_mount.c | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 29c2f83..b2bd3a0 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -440,7 +440,7 @@ xfs_initialize_perag(
        xfs_agnumber_t  agcount,
        xfs_agnumber_t  *maxagi)
 {
-       xfs_agnumber_t  index, max_metadata;
+       xfs_agnumber_t  index;
        xfs_agnumber_t  first_initialised = 0;
        xfs_perag_t     *pag;
        xfs_agino_t     agino;
@@ -500,43 +500,10 @@ xfs_initialize_perag(
        else
                mp->m_flags &= ~XFS_MOUNT_32BITINODES;
 
-       if (mp->m_flags & XFS_MOUNT_32BITINODES) {
-               /*
-                * Calculate how much should be reserved for inodes to meet
-                * the max inode percentage.
-                */
-               if (mp->m_maxicount) {
-                       __uint64_t      icount;
-
-                       icount = sbp->sb_dblocks * sbp->sb_imax_pct;
-                       do_div(icount, 100);
-                       icount += sbp->sb_agblocks - 1;
-                       do_div(icount, sbp->sb_agblocks);
-                       max_metadata = icount;
-               } else {
-                       max_metadata = agcount;
-               }
-
-               for (index = 0; index < agcount; index++) {
-                       ino = XFS_AGINO_TO_INO(mp, index, agino);
-                       if (ino > XFS_MAXINUMBER_32) {
-                               index++;
-                               break;
-                       }
-
-                       pag = xfs_perag_get(mp, index);
-                       pag->pagi_inodeok = 1;
-                       if (index < max_metadata)
-                               pag->pagf_metadata = 1;
-                       xfs_perag_put(pag);
-               }
-       } else {
-               for (index = 0; index < agcount; index++) {
-                       pag = xfs_perag_get(mp, index);
-                       pag->pagi_inodeok = 1;
-                       xfs_perag_put(pag);
-               }
-       }
+       if (mp->m_flags & XFS_MOUNT_32BITINODES)
+               index = xfs_set_inode32(mp);
+       else
+               index = xfs_set_inode64(mp);
 
        if (maxagi)
                *maxagi = index;
-- 
1.7.11.4

<Prev in Thread] Current Thread [Next in Thread>