xfs
[Top] [All Lists]

[PATCH] xfs: Remove the second parameter to xfs_sb_count()

To: XFS Mailing List <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfs: Remove the second parameter to xfs_sb_count()
From: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Date: Wed, 29 Jun 2011 15:10:14 -0700
Cc: Alex Elder <aelder@xxxxxxx>
Organization: IBM
Reply-to: sekharan@xxxxxxxxxx
Remove the second parameter to xfs_sb_count() since all callers of the
function set them.

Also, fix the header comment regarding it being called periodically.

Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
---
 fs/xfs/linux-2.6/xfs_sync.c |    2 +-
 fs/xfs/xfs_mount.c          |   15 +++++----------
 fs/xfs/xfs_mount.h          |    2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 8ecad5f..b32c09e 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -436,7 +436,7 @@ xfs_quiesce_attr(
        WARN_ON(atomic_read(&mp->m_active_trans) != 0);
 
        /* Push the superblock and write an unmount record */
-       error = xfs_log_sbcount(mp, 1);
+       error = xfs_log_sbcount(mp);
        if (error)
                xfs_warn(mp, "xfs_attr_quiesce: failed to log sb changes. "
                                "Frozen image may not be consistent.");
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index b49b823..e569b77 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1532,7 +1532,7 @@ xfs_unmountfs(
                xfs_warn(mp, "Unable to free reserved block pool. "
                                "Freespace may not be correct on next mount.");
 
-       error = xfs_log_sbcount(mp, 1);
+       error = xfs_log_sbcount(mp);
        if (error)
                xfs_warn(mp, "Unable to update superblock counters. "
                                "Freespace may not be correct on next mount.");
@@ -1568,18 +1568,14 @@ xfs_fs_writable(xfs_mount_t *mp)
 /*
  * xfs_log_sbcount
  *
- * Called either periodically to keep the on disk superblock values
- * roughly up to date or from unmount to make sure the values are
- * correct on a clean unmount.
+ * Sync the superblock counters to disk.
  *
  * Note this code can be called during the process of freezing, so
- * we may need to use the transaction allocator which does not not
+ * we may need to use the transaction allocator which does not
  * block when the transaction subsystem is in its frozen state.
  */
 int
-xfs_log_sbcount(
-       xfs_mount_t     *mp,
-       uint            sync)
+xfs_log_sbcount(xfs_mount_t *mp)
 {
        xfs_trans_t     *tp;
        int             error;
@@ -1605,8 +1601,7 @@ xfs_log_sbcount(
        }
 
        xfs_mod_sb(tp, XFS_SB_IFREE | XFS_SB_ICOUNT | XFS_SB_FDBLOCKS);
-       if (sync)
-               xfs_trans_set_sync(tp);
+       xfs_trans_set_sync(tp);
        error = xfs_trans_commit(tp, 0);
        return error;
 }
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 3d68bb2..bb24dac 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -371,7 +371,7 @@ typedef struct xfs_mod_sb {
        int64_t         msb_delta;      /* Change to make to specified field */
 } xfs_mod_sb_t;
 
-extern int     xfs_log_sbcount(xfs_mount_t *, uint);
+extern int     xfs_log_sbcount(xfs_mount_t *);
 extern __uint64_t xfs_default_resblks(xfs_mount_t *mp);
 extern int     xfs_mountfs(xfs_mount_t *mp);
 
-- 
1.7.1



<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfs: Remove the second parameter to xfs_sb_count(), Chandra Seetharaman <=