xfs: add size update tracepoint to IO completion

[pandora-kernel.git] / fs / xfs / xfs_mount.c

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 2be5e5c..7f25245 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1089,10 +1089,6 @@ xfs_mount_reset_sbqflags(
        if (mp->m_flags & XFS_MOUNT_RDONLY)
                return 0;
 
-#ifdef QUOTADEBUG
-       xfs_notice(mp, "Writing superblock quota changes");
-#endif
-
        tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SBCHANGE);
        error = xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0,
                                      XFS_DEFAULT_LOG_COUNT);
@@ -1525,7 +1521,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.");
@@ -1559,14 +1555,16 @@ xfs_fs_writable(xfs_mount_t *mp)
 }
 
 /*
- * 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.
+ * xfs_log_sbcount
+ *
+ * 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
+ * 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;
@@ -1583,13 +1581,7 @@ xfs_log_sbcount(
        if (!xfs_sb_version_haslazysbcount(&mp->m_sb))
                return 0;
 
-       /*
-        * We can be called during the process of freezing, so make sure
-        * we go ahead even if the frozen for new transactions.  We will
-        * always use a sync transaction in the freeze path to make sure
-        * the transaction has completed by the time we return.
-        */
-       tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_COUNT, KM_SLEEP, false);
+       tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_COUNT, KM_SLEEP);
        error = xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0,
                                        XFS_DEFAULT_LOG_COUNT);
        if (error) {
@@ -1598,8 +1590,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;
 }