X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_capa.h;h=6c31c45321082288e4e7efd06deccd4ce8b3c054;hp=6e0873a6887c7edfa8c59e5ed96b819f33d0f8bc;hb=a067251099b6b225f2409f680d9e4423253d0730;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70

diff --git a/lustre/include/lustre_capa.h b/lustre/include/lustre_capa.h
index 6e0873a..6c31c45 100644
--- a/lustre/include/lustre_capa.h
+++ b/lustre/include/lustre_capa.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -83,13 +85,13 @@ struct obd_capa {
         struct lustre_capa        c_capa;       /* capa */
         cfs_atomic_t              c_refc;       /* ref count */
         cfs_time_t                c_expiry;     /* jiffies */
-        cfs_spinlock_t            c_lock;       /* protect capa content */
-        int                       c_site;
+	spinlock_t		c_lock;	/* protect capa content */
+	int			c_site;
 
-        union {
-                struct client_capa      cli;
-                struct target_capa      tgt;
-        } u;
+	union {
+		struct client_capa	cli;
+		struct target_capa	tgt;
+	} u;
 };
 
 enum {
@@ -175,9 +177,9 @@ typedef int (* renew_capa_cb_t)(struct obd_capa *, struct lustre_capa *);
 
 /* obdclass/capa.c */
 extern cfs_list_t capa_list[];
-extern cfs_spinlock_t capa_lock;
+extern spinlock_t capa_lock;
 extern int capa_count[];
-extern cfs_mem_cache_t *capa_cachep;
+extern struct kmem_cache *capa_cachep;
 
 cfs_hlist_head_t *init_capa_hash(void);
 void cleanup_capa_hash(cfs_hlist_head_t *hash);
@@ -205,7 +207,7 @@ static inline struct obd_capa *alloc_capa(int site)
 
         CFS_INIT_LIST_HEAD(&ocapa->c_list);
         cfs_atomic_set(&ocapa->c_refc, 1);
-        cfs_spin_lock_init(&ocapa->c_lock);
+	spin_lock_init(&ocapa->c_lock);
         ocapa->c_site = site;
         if (ocapa->c_site == CAPA_SITE_CLIENT)
                 CFS_INIT_LIST_HEAD(&ocapa->u.cli.lli_list);