Merge tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[karo-tx-linux.git] / fs / xfs / xfs_stats.c

diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
index 6e812fe0fd43cc04b4f879c053c296f6cc1a5092..f11282c96887ac969f95c6cc4e7c9c6f3e1612fd 100644 (file)
--- a/fs/xfs/xfs_stats.c
+++ b/fs/xfs/xfs_stats.c
@@ -62,6 +62,7 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf)
                { "ibt2",               XFSSTAT_END_IBT_V2              },
                { "fibt2",              XFSSTAT_END_FIBT_V2             },
                { "rmapbt",             XFSSTAT_END_RMAP_V2             },
+               { "refcntbt",           XFSSTAT_END_REFCOUNT            },
                /* we print both series of quota information together */
                { "qm",                 XFSSTAT_END_QM                  },
        };
@@ -79,9 +80,9 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf)
        }
        /* extra precision counters */
        for_each_possible_cpu(i) {
-               xs_xstrat_bytes += per_cpu_ptr(stats, i)->xs_xstrat_bytes;
-               xs_write_bytes += per_cpu_ptr(stats, i)->xs_write_bytes;
-               xs_read_bytes += per_cpu_ptr(stats, i)->xs_read_bytes;
+               xs_xstrat_bytes += per_cpu_ptr(stats, i)->s.xs_xstrat_bytes;
+               xs_write_bytes += per_cpu_ptr(stats, i)->s.xs_write_bytes;
+               xs_read_bytes += per_cpu_ptr(stats, i)->s.xs_read_bytes;
        }
 
        len += snprintf(buf + len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n",
@@ -105,9 +106,9 @@ void xfs_stats_clearall(struct xfsstats __percpu *stats)
        for_each_possible_cpu(c) {
                preempt_disable();
                /* save vn_active, it's a universal truth! */
-               vn_active = per_cpu_ptr(stats, c)->vn_active;
+               vn_active = per_cpu_ptr(stats, c)->s.vn_active;
                memset(per_cpu_ptr(stats, c), 0, sizeof(*stats));
-               per_cpu_ptr(stats, c)->vn_active = vn_active;
+               per_cpu_ptr(stats, c)->s.vn_active = vn_active;
                preempt_enable();
        }
 }