X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flucache.h;h=990ed7973b19ab653556ef0147dbd71eb371bcda;hb=88fe67803334531c848c2a3771d1c6ac412227db;hp=d9a285b48d10cc1b856715da30eed422ccbad1a1;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/lucache.h b/libcfs/include/libcfs/lucache.h
index d9a285b..990ed79 100644
--- a/libcfs/include/libcfs/lucache.h
+++ b/libcfs/include/libcfs/lucache.h
@@ -38,6 +38,7 @@
 #define _LUCACHE_H
 
 #include <libcfs/libcfs.h>
+#include <lnet/types.h>
 
 /** \defgroup ucache ucache
  *
@@ -74,25 +75,25 @@ struct md_perm {
 };
 
 struct md_identity {
-        struct upcall_cache_entry *mi_uc_entry;
-        uid_t                      mi_uid;
-        gid_t                      mi_gid;
-        cfs_group_info_t          *mi_ginfo;
-        int                        mi_nperms;
-        struct md_perm            *mi_perms;
+	struct upcall_cache_entry *mi_uc_entry;
+	uid_t                      mi_uid;
+	gid_t                      mi_gid;
+	struct group_info          *mi_ginfo;
+	int                        mi_nperms;
+	struct md_perm            *mi_perms;
 };
 
 struct upcall_cache_entry {
-        cfs_list_t              ue_hash;
-        __u64                   ue_key;
-        cfs_atomic_t            ue_refcount;
-        int                     ue_flags;
-        cfs_waitq_t             ue_waitq;
-        cfs_time_t              ue_acquire_expire;
-        cfs_time_t              ue_expire;
-        union {
-                struct md_identity     identity;
-        } u;
+	struct list_head	ue_hash;
+	__u64			ue_key;
+	atomic_t		ue_refcount;
+	int			ue_flags;
+	wait_queue_head_t	ue_waitq;
+	cfs_time_t		ue_acquire_expire;
+	cfs_time_t		ue_expire;
+	union {
+		struct md_identity	identity;
+	} u;
 };
 
 #define UC_CACHE_HASH_SIZE        (128)
@@ -118,7 +119,7 @@ struct upcall_cache_ops {
 };
 
 struct upcall_cache {
-	cfs_list_t		uc_hashtable[UC_CACHE_HASH_SIZE];
+	struct list_head	uc_hashtable[UC_CACHE_HASH_SIZE];
 	spinlock_t		uc_lock;
 	rwlock_t		uc_upcall_rwlock;