xfs: per-filesystem stats counter implementation

This patch modifies the stats counting macros and the callers
to those macros to properly increment, decrement, and add-to
the xfs stats counts. The counts for global and per-fs stats
are correctly advanced, and cleared by writing a "1" to the
corresponding clear file.

global counts: /sys/fs/xfs/stats/stats
per-fs counts: /sys/fs/xfs/sda*/stats/stats

global clear:  /sys/fs/xfs/stats/stats_clear
per-fs clear:  /sys/fs/xfs/sda*/stats/stats_clear

[dchinner: cleaned up macro variables, removed CONFIG_FS_PROC around
 stats structures and macros. ]

Signed-off-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index eac9549efd52..7af7648c06c6 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -184,7 +184,7 @@ xfs_qm_dqpurge(
          */
         ASSERT(!list_empty(&dqp->q_lru));
         list_lru_del(&qi->qi_lru, &dqp->q_lru);
-        XFS_STATS_DEC(xs_qm_dquot_unused);
+        XFS_STATS_DEC(mp, xs_qm_dquot_unused);
 
         xfs_qm_dqdestroy(dqp);
         return 0;
@@ -448,11 +448,11 @@ xfs_qm_dquot_isolate(
          */
         if (dqp->q_nrefs) {
                 xfs_dqunlock(dqp);
-                XFS_STATS_INC(xs_qm_dqwants);
+                XFS_STATS_INC(dqp->q_mount, xs_qm_dqwants);
 
                 trace_xfs_dqreclaim_want(dqp);
                 list_lru_isolate(lru, &dqp->q_lru);
-                XFS_STATS_DEC(xs_qm_dquot_unused);
+                XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot_unused);
                 return LRU_REMOVED;
         }
 
@@ -496,19 +496,19 @@ xfs_qm_dquot_isolate(
 
         ASSERT(dqp->q_nrefs == 0);
         list_lru_isolate_move(lru, &dqp->q_lru, &isol->dispose);
-        XFS_STATS_DEC(xs_qm_dquot_unused);
+        XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot_unused);
         trace_xfs_dqreclaim_done(dqp);
-        XFS_STATS_INC(xs_qm_dqreclaims);
+        XFS_STATS_INC(dqp->q_mount, xs_qm_dqreclaims);
         return LRU_REMOVED;
 
 out_miss_busy:
         trace_xfs_dqreclaim_busy(dqp);
-        XFS_STATS_INC(xs_qm_dqreclaim_misses);
+        XFS_STATS_INC(dqp->q_mount, xs_qm_dqreclaim_misses);
         return LRU_SKIP;
 
 out_unlock_dirty:
         trace_xfs_dqreclaim_busy(dqp);
-        XFS_STATS_INC(xs_qm_dqreclaim_misses);
+        XFS_STATS_INC(dqp->q_mount, xs_qm_dqreclaim_misses);
         xfs_dqunlock(dqp);
         spin_lock(lru_lock);
         return LRU_RETRY;