lkml.org 
[lkml]   [2020]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC PATCH 40/61] fscache: Remove more obsolete stats
    From
    Date
    Remove some more stats that have become obsolete.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/fscache/internal.h | 18 ++----------------
    fs/fscache/obj.c | 6 +++---
    fs/fscache/stats.c | 50 +++++++++----------------------------------------
    3 files changed, 14 insertions(+), 60 deletions(-)

    diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
    index a70c1a612309..d168e37011af 100644
    --- a/fs/fscache/internal.h
    +++ b/fs/fscache/internal.h
    @@ -163,25 +163,13 @@ extern void fscache_proc_cleanup(void);
    * stats.c
    */
    #ifdef CONFIG_FSCACHE_STATS
    -extern atomic_t fscache_n_op_pend;
    -extern atomic_t fscache_n_op_run;
    -extern atomic_t fscache_n_op_enqueue;
    -extern atomic_t fscache_n_op_deferred_release;
    -extern atomic_t fscache_n_op_initialised;
    -extern atomic_t fscache_n_op_release;
    -extern atomic_t fscache_n_op_gc;
    -extern atomic_t fscache_n_op_cancelled;
    -extern atomic_t fscache_n_op_rejected;
    -
    extern atomic_t fscache_n_acquires;
    extern atomic_t fscache_n_acquires_null;
    extern atomic_t fscache_n_acquires_no_cache;
    extern atomic_t fscache_n_acquires_ok;
    -extern atomic_t fscache_n_acquires_nobufs;
    extern atomic_t fscache_n_acquires_oom;

    extern atomic_t fscache_n_invalidates;
    -extern atomic_t fscache_n_invalidates_run;

    extern atomic_t fscache_n_updates;
    extern atomic_t fscache_n_updates_null;
    @@ -200,15 +188,13 @@ extern atomic_t fscache_n_object_no_alloc;
    extern atomic_t fscache_n_object_lookups;
    extern atomic_t fscache_n_object_lookups_negative;
    extern atomic_t fscache_n_object_lookups_positive;
    -extern atomic_t fscache_n_object_lookups_timed_out;
    -extern atomic_t fscache_n_object_created;
    +extern atomic_t fscache_n_object_creates;
    extern atomic_t fscache_n_object_avail;
    extern atomic_t fscache_n_object_dead;

    extern atomic_t fscache_n_cop_alloc_object;
    extern atomic_t fscache_n_cop_lookup_object;
    -extern atomic_t fscache_n_cop_lookup_complete;
    -extern atomic_t fscache_n_cop_grab_object;
    +extern atomic_t fscache_n_cop_create_object;
    extern atomic_t fscache_n_cop_invalidate_object;
    extern atomic_t fscache_n_cop_update_object;
    extern atomic_t fscache_n_cop_drop_object;
    diff --git a/fs/fscache/obj.c b/fs/fscache/obj.c
    index 1bf2bee00d18..7d8297f4d6a2 100644
    --- a/fs/fscache/obj.c
    +++ b/fs/fscache/obj.c
    @@ -47,10 +47,10 @@ static int fscache_do_lookup_object(struct fscache_object *object, void *data)
    static int fscache_do_create_object(struct fscache_object *object, void *data)
    {
    int ret;
    - fscache_stat(&fscache_n_object_lookups);
    - fscache_stat(&fscache_n_cop_lookup_object);
    + fscache_stat(&fscache_n_object_creates);
    + fscache_stat(&fscache_n_cop_create_object);
    ret = object->cache->ops->create_object(object, data);
    - fscache_stat_d(&fscache_n_cop_lookup_object);
    + fscache_stat_d(&fscache_n_cop_create_object);
    return ret;
    }

    diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
    index 583817f4f113..ccca0016fd26 100644
    --- a/fs/fscache/stats.c
    +++ b/fs/fscache/stats.c
    @@ -14,25 +14,13 @@
    /*
    * operation counters
    */
    -atomic_t fscache_n_op_pend;
    -atomic_t fscache_n_op_run;
    -atomic_t fscache_n_op_enqueue;
    -atomic_t fscache_n_op_deferred_release;
    -atomic_t fscache_n_op_initialised;
    -atomic_t fscache_n_op_release;
    -atomic_t fscache_n_op_gc;
    -atomic_t fscache_n_op_cancelled;
    -atomic_t fscache_n_op_rejected;
    -
    atomic_t fscache_n_acquires;
    atomic_t fscache_n_acquires_null;
    atomic_t fscache_n_acquires_no_cache;
    atomic_t fscache_n_acquires_ok;
    -atomic_t fscache_n_acquires_nobufs;
    atomic_t fscache_n_acquires_oom;

    atomic_t fscache_n_invalidates;
    -atomic_t fscache_n_invalidates_run;

    atomic_t fscache_n_updates;
    atomic_t fscache_n_updates_null;
    @@ -51,15 +39,13 @@ atomic_t fscache_n_object_no_alloc;
    atomic_t fscache_n_object_lookups;
    atomic_t fscache_n_object_lookups_negative;
    atomic_t fscache_n_object_lookups_positive;
    -atomic_t fscache_n_object_lookups_timed_out;
    -atomic_t fscache_n_object_created;
    +atomic_t fscache_n_object_creates;
    atomic_t fscache_n_object_avail;
    atomic_t fscache_n_object_dead;

    atomic_t fscache_n_cop_alloc_object;
    atomic_t fscache_n_cop_lookup_object;
    -atomic_t fscache_n_cop_lookup_complete;
    -atomic_t fscache_n_cop_grab_object;
    +atomic_t fscache_n_cop_create_object;
    atomic_t fscache_n_cop_invalidate_object;
    atomic_t fscache_n_cop_update_object;
    atomic_t fscache_n_cop_drop_object;
    @@ -90,25 +76,21 @@ int fscache_stats_show(struct seq_file *m, void *v)
    atomic_read(&fscache_n_object_avail),
    atomic_read(&fscache_n_object_dead));

    - seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
    - " oom=%u\n",
    + seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u oom=%u\n",
    atomic_read(&fscache_n_acquires),
    atomic_read(&fscache_n_acquires_null),
    atomic_read(&fscache_n_acquires_no_cache),
    atomic_read(&fscache_n_acquires_ok),
    - atomic_read(&fscache_n_acquires_nobufs),
    atomic_read(&fscache_n_acquires_oom));

    - seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
    + seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u\n",
    atomic_read(&fscache_n_object_lookups),
    atomic_read(&fscache_n_object_lookups_negative),
    atomic_read(&fscache_n_object_lookups_positive),
    - atomic_read(&fscache_n_object_created),
    - atomic_read(&fscache_n_object_lookups_timed_out));
    + atomic_read(&fscache_n_object_creates));

    - seq_printf(m, "Invals : n=%u run=%u\n",
    - atomic_read(&fscache_n_invalidates),
    - atomic_read(&fscache_n_invalidates_run));
    + seq_printf(m, "Invals : n=%u\n",
    + atomic_read(&fscache_n_invalidates));

    seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
    atomic_read(&fscache_n_updates),
    @@ -120,23 +102,9 @@ int fscache_stats_show(struct seq_file *m, void *v)
    atomic_read(&fscache_n_relinquishes_null),
    atomic_read(&fscache_n_relinquishes_retire));

    - seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
    - atomic_read(&fscache_n_op_pend),
    - atomic_read(&fscache_n_op_run),
    - atomic_read(&fscache_n_op_enqueue),
    - atomic_read(&fscache_n_op_cancelled),
    - atomic_read(&fscache_n_op_rejected));
    - seq_printf(m, "Ops : ini=%u dfr=%u rel=%u gc=%u\n",
    - atomic_read(&fscache_n_op_initialised),
    - atomic_read(&fscache_n_op_deferred_release),
    - atomic_read(&fscache_n_op_release),
    - atomic_read(&fscache_n_op_gc));
    -
    - seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
    + seq_printf(m, "CacheOp: alo=%d luo=%d\n",
    atomic_read(&fscache_n_cop_alloc_object),
    - atomic_read(&fscache_n_cop_lookup_object),
    - atomic_read(&fscache_n_cop_lookup_complete),
    - atomic_read(&fscache_n_cop_grab_object));
    + atomic_read(&fscache_n_cop_lookup_object));
    seq_printf(m, "CacheOp: inv=%d upo=%d dro=%d pto=%d atc=%d syn=%d\n",
    atomic_read(&fscache_n_cop_invalidate_object),
    atomic_read(&fscache_n_cop_update_object),

    \
     
     \ /
      Last update: 2020-05-04 19:14    [W:4.970 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site