LU-334 llite: Add LPROC_LL_OSC_{READ,WRITE}.

[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 057e951..6087969 100644 (file)
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -77,12 +77,12 @@ typedef struct percpu_counter lcounter_t;
 #define lcounter_destroy(counter)       percpu_counter_destroy(counter)
 
 #else
-typedef struct { atomic_t count; } lcounter_t;
+typedef struct { cfs_atomic_t count; } lcounter_t;
 
-#define lcounter_read(counter)          atomic_read(&counter->count)
-#define lcounter_inc(counter)           atomic_inc(&counter->count)
-#define lcounter_dec(counter)           atomic_dec(&counter->count)
-#define lcounter_init(counter)          atomic_set(&counter->count, 0)
+#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 */
@@ -99,6 +99,8 @@ enum {
          LPROC_LL_WRITE_BYTES,
          LPROC_LL_BRW_READ,
          LPROC_LL_BRW_WRITE,
+         LPROC_LL_OSC_READ,
+         LPROC_LL_OSC_WRITE,
          LPROC_LL_IOCTL,
          LPROC_LL_OPEN,
          LPROC_LL_RELEASE,