X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqmt_internal.h;h=d83ff830e2fb869b0059c841f898d7cb78eb3a5c;hb=0f67add39b81f28e86f1df2aaea830b250125a47;hp=7cad493c0d086bde82573c7026cb4683de2fbd3d;hpb=51435cfffcd6815e70fb46b0ec2edcac3327bf44;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qmt_internal.h b/lustre/quota/qmt_internal.h
index 7cad493..d83ff83 100644
--- a/lustre/quota/qmt_internal.h
+++ b/lustre/quota/qmt_internal.h
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -80,7 +80,7 @@ struct qmt_device {
 	cfs_list_t		 qmt_reba_list;
 
 	/* lock protecting rebalancing list */
-	cfs_spinlock_t		 qmt_reba_lock;
+	spinlock_t		 qmt_reba_lock;
 
 	unsigned long		 qmt_stopping:1; /* qmt is stopping */
 
@@ -156,7 +156,7 @@ static inline struct qmt_pool_info *lqe2qpi(struct lquota_entry *lqe)
 static inline bool lqe_is_locked(struct lquota_entry *lqe)
 {
 	LASSERT(lqe_is_master(lqe));
-	if (cfs_down_write_trylock(&lqe->lqe_sem) == 0)
+	if (down_write_trylock(&lqe->lqe_sem) == 0)
 		return true;
 	lqe_write_unlock(lqe);
 	return false;