LU-12545 llite: cleanup stats of LPROC_LL_*

Some LPROC_LL_ stats are not used for a long time. This patch
removes them. LPROC_LL_STAFS is changed to LPROC_LL_STATFS in
this patch too.

Change-Id: I64b033e186733147e2a2984d8afec97240d03573
Signed-off-by: Li Xi <lixi@ddn.com>
Reviewed-on: https://review.whamcloud.com/35514
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 20bdcbb..5dcee4b 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -806,12 +806,8 @@ void ll_debugfs_unregister_super(struct super_block *sb);
 void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count);
 
 enum {
 void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count);
 
 enum {

-       LPROC_LL_DIRTY_HITS,
-       LPROC_LL_DIRTY_MISSES,

        LPROC_LL_READ_BYTES,
        LPROC_LL_WRITE_BYTES,
        LPROC_LL_READ_BYTES,
        LPROC_LL_WRITE_BYTES,

-       LPROC_LL_BRW_READ,
-       LPROC_LL_BRW_WRITE,

        LPROC_LL_IOCTL,
        LPROC_LL_OPEN,
        LPROC_LL_RELEASE,
        LPROC_LL_IOCTL,
        LPROC_LL_OPEN,
        LPROC_LL_RELEASE,


@@ -833,7 +829,7 @@ enum {
        LPROC_LL_RMDIR,
        LPROC_LL_MKNOD,
        LPROC_LL_RENAME,
        LPROC_LL_RMDIR,
        LPROC_LL_MKNOD,
        LPROC_LL_RENAME,

-       LPROC_LL_STAFS,
+       LPROC_LL_STATFS,

        LPROC_LL_ALLOC_INODE,
        LPROC_LL_SETXATTR,
        LPROC_LL_GETXATTR,
        LPROC_LL_ALLOC_INODE,
        LPROC_LL_SETXATTR,
        LPROC_LL_GETXATTR,

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 9e389d8..bdd70c1 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1991,7 +1991,7 @@ int ll_statfs(struct dentry *de, struct kstatfs *sfs)
        int rc;
 
        CDEBUG(D_VFSTRACE, "VFS Op: at %llu jiffies\n", get_jiffies_64());
        int rc;
 
        CDEBUG(D_VFSTRACE, "VFS Op: at %llu jiffies\n", get_jiffies_64());

-        ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_STAFS, 1);
+       ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_STATFS, 1);

 
        /* Some amount of caching on the client is allowed */
        rc = ll_statfs_internal(ll_s2sbi(sb), &osfs, OBD_STATFS_SUM);
 
        /* Some amount of caching on the client is allowed */
        rc = ll_statfs_internal(ll_s2sbi(sb), &osfs, OBD_STATFS_SUM);

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index bf43681..bfb6949 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -1540,16 +1540,10 @@ static const struct llite_file_opcode {
         const char *opname;
 } llite_opcode_table[LPROC_LL_FILE_OPCODES] = {
         /* file operation */
         const char *opname;
 } llite_opcode_table[LPROC_LL_FILE_OPCODES] = {
         /* file operation */

-        { LPROC_LL_DIRTY_HITS,     LPROCFS_TYPE_REGS, "dirty_pages_hits" },
-        { LPROC_LL_DIRTY_MISSES,   LPROCFS_TYPE_REGS, "dirty_pages_misses" },

         { LPROC_LL_READ_BYTES,     LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
                                    "read_bytes" },
         { LPROC_LL_WRITE_BYTES,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
                                    "write_bytes" },
         { LPROC_LL_READ_BYTES,     LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
                                    "read_bytes" },
         { LPROC_LL_WRITE_BYTES,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
                                    "write_bytes" },

-        { LPROC_LL_BRW_READ,       LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "brw_read" },
-        { LPROC_LL_BRW_WRITE,      LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "brw_write" },

         { LPROC_LL_IOCTL,          LPROCFS_TYPE_REGS, "ioctl" },
         { LPROC_LL_OPEN,           LPROCFS_TYPE_REGS, "open" },
         { LPROC_LL_RELEASE,        LPROCFS_TYPE_REGS, "close" },
         { LPROC_LL_IOCTL,          LPROCFS_TYPE_REGS, "ioctl" },
         { LPROC_LL_OPEN,           LPROCFS_TYPE_REGS, "open" },
         { LPROC_LL_RELEASE,        LPROCFS_TYPE_REGS, "close" },


@@ -1573,15 +1567,15 @@ static const struct llite_file_opcode {
         { LPROC_LL_RMDIR,          LPROCFS_TYPE_REGS, "rmdir" },
         { LPROC_LL_MKNOD,          LPROCFS_TYPE_REGS, "mknod" },
         { LPROC_LL_RENAME,         LPROCFS_TYPE_REGS, "rename" },
         { LPROC_LL_RMDIR,          LPROCFS_TYPE_REGS, "rmdir" },
         { LPROC_LL_MKNOD,          LPROCFS_TYPE_REGS, "mknod" },
         { LPROC_LL_RENAME,         LPROCFS_TYPE_REGS, "rename" },

-        /* special inode operation */
-        { LPROC_LL_STAFS,          LPROCFS_TYPE_REGS, "statfs" },
-        { LPROC_LL_ALLOC_INODE,    LPROCFS_TYPE_REGS, "alloc_inode" },
-        { LPROC_LL_SETXATTR,       LPROCFS_TYPE_REGS, "setxattr" },
-        { LPROC_LL_GETXATTR,       LPROCFS_TYPE_REGS, "getxattr" },
+       /* special inode operation */
+       { LPROC_LL_STATFS,          LPROCFS_TYPE_REGS, "statfs" },
+       { LPROC_LL_ALLOC_INODE,    LPROCFS_TYPE_REGS, "alloc_inode" },
+       { LPROC_LL_SETXATTR,       LPROCFS_TYPE_REGS, "setxattr" },
+       { LPROC_LL_GETXATTR,       LPROCFS_TYPE_REGS, "getxattr" },

        { LPROC_LL_GETXATTR_HITS,  LPROCFS_TYPE_REGS, "getxattr_hits" },
        { LPROC_LL_GETXATTR_HITS,  LPROCFS_TYPE_REGS, "getxattr_hits" },

-        { LPROC_LL_LISTXATTR,      LPROCFS_TYPE_REGS, "listxattr" },
-        { LPROC_LL_REMOVEXATTR,    LPROCFS_TYPE_REGS, "removexattr" },
-        { LPROC_LL_INODE_PERM,     LPROCFS_TYPE_REGS, "inode_permission" },
+       { LPROC_LL_LISTXATTR,      LPROCFS_TYPE_REGS, "listxattr" },
+       { LPROC_LL_REMOVEXATTR,    LPROCFS_TYPE_REGS, "removexattr" },
+       { LPROC_LL_INODE_PERM,     LPROCFS_TYPE_REGS, "inode_permission" },

 };
 
 void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)
 };
 
 void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)