X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam.h;h=67364e3dcb9181a730e2cd8c1c2aebb41722a3da;hb=7d1927ec6e3298c76ff90b4c622f58d6d033ba9b;hp=f55a11b10391cc093852e2f76074ca57eebd58d7;hpb=7cbd1b0c7409b4bfb44dc6869afc4ff9c90a7dce;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_iam.h b/lustre/osd-ldiskfs/osd_iam.h
index f55a11b..67364e3 100644
--- a/lustre/osd-ldiskfs/osd_iam.h
+++ b/lustre/osd-ldiskfs/osd_iam.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -482,12 +482,12 @@ struct iam_container {
         /*
          * read-write lock protecting index consistency.
          */
-        cfs_rw_semaphore_t   ic_sem;
+	struct rw_semaphore	ic_sem;
 	struct dynlock       ic_tree_lock;
 	/*
 	 * Protect ic_idle_bh
 	 */
-	cfs_semaphore_t      ic_idle_sem;
+	struct semaphore	ic_idle_sem;
 	/*
 	 * BH for idle blocks
 	 */
@@ -1042,9 +1042,9 @@ static inline void iam_lock_bh(struct buffer_head volatile *bh)
 {
         DX_DEVAL(iam_lock_stats.dls_bh_lock++);
 #ifdef CONFIG_SMP
-        while (cfs_test_and_set_bit(BH_DXLock, &bh->b_state)) {
-                DX_DEVAL(iam_lock_stats.dls_bh_busy++);
-                while (cfs_test_bit(BH_DXLock, &bh->b_state))
+	while (test_and_set_bit(BH_DXLock, &bh->b_state)) {
+		DX_DEVAL(iam_lock_stats.dls_bh_busy++);
+		while (test_bit(BH_DXLock, &bh->b_state))
                         cpu_relax();
         }
 #endif