b23289 smp improvement for watchdog i=eric.mei i=maxim

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

diff --git a/lustre/include/lustre_lite.h b/lustre/include/lustre_lite.h
index 9fab984..cb0e730 100644 (file)
--- a/lustre/include/lustre_lite.h
+++ b/lustre/include/lustre_lite.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -37,6 +37,11 @@
 #ifndef _LL_H
 #define _LL_H
 
+/** \defgroup lite lite
+ *
+ * @{
+ */
+
 #if defined(__linux__)
 #include <linux/lustre_lite.h>
 #elif defined(__APPLE__)
@@ -124,8 +129,8 @@ struct lustre_client_ocd {
          * mount is connected to. This field is updated by ll_ocd_update()
          * under ->lco_lock.
          */
-        __u64      lco_flags;
-        spinlock_t lco_lock;
+        __u64              lco_flags;
+        cfs_semaphore_t    lco_lock;
         struct obd_export *lco_md_exp;
         struct obd_export *lco_dt_exp;
 };
@@ -145,8 +150,11 @@ static inline void ll_dir_chain_fini(struct ll_dir_chain *chain)
 {
 }
 
-static inline __u32 hash_x_index(__u32 value)
+static inline unsigned long hash_x_index(unsigned long value)
 {
-        return ((__u32)~0) - value;
+        return ~0UL - value;
 }
+
+/** @} lite */
+
 #endif