LU-673 llite: Add some metadata stats, fix some file stats.

[fs/lustre-release.git] / lustre / include / linux / lustre_lite.h

diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h
index 6087969..0c1d8e8 100644 (file)
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -59,42 +59,10 @@
 #include <linux/lustre_compat25.h>
 #include <linux/pagemap.h>
 
-#ifdef HAVE_PERCPU_COUNTER
-#include <linux/percpu_counter.h>
-
-typedef struct percpu_counter lcounter_t;
-
-#define lcounter_read(counter)          (int)percpu_counter_read(counter)
-#define lcounter_inc(counter)           percpu_counter_inc(counter)
-#define lcounter_dec(counter)           percpu_counter_dec(counter)
-
-#ifdef HAVE_PERCPU_2ND_ARG
-# define lcounter_init(counter)          percpu_counter_init(counter, 0)
-#else
-# define lcounter_init(counter)          percpu_counter_init(counter)
-#endif
-
-#define lcounter_destroy(counter)       percpu_counter_destroy(counter)
-
-#else
-typedef struct { cfs_atomic_t count; } lcounter_t;
-
-#define lcounter_read(counter)          cfs_atomic_read(&counter->count)
-#define lcounter_inc(counter)           cfs_atomic_inc(&counter->count)
-#define lcounter_dec(counter)           cfs_atomic_dec(&counter->count)
-#define lcounter_init(counter)          cfs_atomic_set(&counter->count, 0)
-#define lcounter_destroy(counter)       
-
-#endif /* if defined HAVE_PERCPU_COUNTER */
-
 /* lprocfs.c */
 enum {
          LPROC_LL_DIRTY_HITS = 0,
          LPROC_LL_DIRTY_MISSES,
-         LPROC_LL_WB_WRITEPAGE,
-         LPROC_LL_WB_PRESSURE,
-         LPROC_LL_WB_OK,
-         LPROC_LL_WB_FAIL,
          LPROC_LL_READ_BYTES,
          LPROC_LL_WRITE_BYTES,
          LPROC_LL_BRW_READ,
@@ -107,11 +75,19 @@ enum {
          LPROC_LL_MAP,
          LPROC_LL_LLSEEK,
          LPROC_LL_FSYNC,
+         LPROC_LL_READDIR,
          LPROC_LL_SETATTR,
          LPROC_LL_TRUNC,
-         LPROC_LL_LOCKLESS_TRUNC,
          LPROC_LL_FLOCK,
          LPROC_LL_GETATTR,
+         LPROC_LL_CREATE,
+         LPROC_LL_LINK,
+         LPROC_LL_UNLINK,
+         LPROC_LL_SYMLINK,
+         LPROC_LL_MKDIR,
+         LPROC_LL_RMDIR,
+         LPROC_LL_MKNOD,
+         LPROC_LL_RENAME,
          LPROC_LL_STAFS,
          LPROC_LL_ALLOC_INODE,
          LPROC_LL_SETXATTR,
@@ -119,10 +95,6 @@ enum {
          LPROC_LL_LISTXATTR,
          LPROC_LL_REMOVEXATTR,
          LPROC_LL_INODE_PERM,
-         LPROC_LL_DIRECT_READ,
-         LPROC_LL_DIRECT_WRITE,
-         LPROC_LL_LOCKLESS_READ,
-         LPROC_LL_LOCKLESS_WRITE,
          LPROC_LL_FILE_OPCODES
 };