X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam.h;h=e3738d7c6f63bb8224236cdad3f8f336494542bc;hb=3cce65712d94cffe8f1626545845b95b88aef672;hp=697dd1568b0bbf3be6d8c3e79412506114d957b7;hpb=34b9fe2f703d91e7ad5b315aaac696d3a314cf0b;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_iam.h b/lustre/osd-ldiskfs/osd_iam.h
index 697dd15..e3738d7 100644
--- a/lustre/osd-ldiskfs/osd_iam.h
+++ b/lustre/osd-ldiskfs/osd_iam.h
@@ -14,12 +14,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].
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -92,7 +88,6 @@ enum {
         DX_FMT_NAME_LEN    = 16,
 };
 
-#ifdef __KERNEL__
 
 /*
  * Debugging.
@@ -1021,7 +1016,7 @@ int iam_lvar_create(struct inode *obj,
 #define dxtrace(command) 
 #endif
 
-#define BH_DXLock        25
+#define BH_DXLock        (BH_BITMAP_UPTODATE + 1)
 #define DX_DEBUG (0)
 #if DX_DEBUG
 static struct iam_lock_stats {
@@ -1039,7 +1034,7 @@ static inline void iam_lock_bh(struct buffer_head volatile *bh)
 {
         DX_DEVAL(iam_lock_stats.dls_bh_lock++);
 #ifdef CONFIG_SMP
-	while (test_and_set_bit(BH_DXLock, &bh->b_state)) {
+	while (test_and_set_bit_lock(BH_DXLock, &bh->b_state)) {
 		DX_DEVAL(iam_lock_stats.dls_bh_busy++);
 		while (test_bit(BH_DXLock, &bh->b_state))
                         cpu_relax();
@@ -1050,8 +1045,7 @@ static inline void iam_lock_bh(struct buffer_head volatile *bh)
 static inline void iam_unlock_bh(struct buffer_head *bh)
 {
 #ifdef CONFIG_SMP
-        smp_mb__before_clear_bit();
-        clear_bit(BH_DXLock, &bh->b_state);
+	clear_bit_unlock(BH_DXLock, &bh->b_state);
 #endif
 }
 
@@ -1094,7 +1088,7 @@ struct iam_format {
         /*
          * Linkage into global list of container formats.
          */
-        cfs_list_t if_linkage;
+	struct list_head if_linkage;
 };
 
 void iam_format_register(struct iam_format *fmt);
@@ -1131,7 +1125,6 @@ static inline int ldiskfs_check_dir_entry(const char * function,
 */
 
 /* __KERNEL__ */
-#endif
 
 /*
  * User level API. Copy exists in lustre/lustre/tests/iam_ut.c