xfs: give the defer_relog stat a xs_ prefix

Make this counter naming consistent with all the others.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 0bd87b40d09184b9dfbb39e759cdf25fd3a7d409..c39e40dcb0b0b8e8ec96419f61d6b6e8c9a68e0b 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -565,7 +565,7 @@ xfs_defer_relog(
                        continue;
 
                trace_xfs_defer_relog_intent((*tpp)->t_mountp, dfp);
-               XFS_STATS_INC((*tpp)->t_mountp, defer_relog);
+               XFS_STATS_INC((*tpp)->t_mountp, xs_defer_relog);
 
                xfs_defer_relog_intent(*tpp, dfp);
        }

diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
index 9781222e0653dee290f038c12e59d9741da365e3..3fe1f5412537f2bd8eef443320704eb571355f2e 100644 (file)
--- a/fs/xfs/xfs_stats.c
+++ b/fs/xfs/xfs_stats.c
@@ -23,7 +23,7 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf)
        uint64_t        xs_xstrat_bytes = 0;
        uint64_t        xs_write_bytes = 0;
        uint64_t        xs_read_bytes = 0;
-       uint64_t        defer_relog = 0;
+       uint64_t        xs_defer_relog = 0;
 
        static const struct xstats_entry {
                char    *desc;
@@ -76,13 +76,13 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf)
                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;
-               defer_relog += per_cpu_ptr(stats, i)->s.defer_relog;
+               xs_defer_relog += per_cpu_ptr(stats, i)->s.xs_defer_relog;
        }
 
        len += scnprintf(buf + len, PATH_MAX-len, "xpc %llu %llu %llu\n",
                        xs_xstrat_bytes, xs_write_bytes, xs_read_bytes);
        len += scnprintf(buf + len, PATH_MAX-len, "defer_relog %llu\n",
-                       defer_relog);
+                       xs_defer_relog);
        len += scnprintf(buf + len, PATH_MAX-len, "debug %u\n",
 #if defined(DEBUG)
                1);

diff --git a/fs/xfs/xfs_stats.h b/fs/xfs/xfs_stats.h
index 15ba1abcf2536f77a2d78be98ad4c10f4cb4ef67..d86c6ce3501070fda20fcf40d59a9a1de40af863 100644 (file)
--- a/fs/xfs/xfs_stats.h
+++ b/fs/xfs/xfs_stats.h
@@ -142,7 +142,7 @@ struct __xfsstats {
        uint64_t                xs_xstrat_bytes;
        uint64_t                xs_write_bytes;
        uint64_t                xs_read_bytes;
-       uint64_t                defer_relog;
+       uint64_t                xs_defer_relog;
 };
 
 #define        xfsstats_offset(f)      (offsetof(struct __xfsstats, f)/sizeof(uint32_t))