LU-5577 libcfs: fix warnings in libcfs/curproc.h

[fs/lustre-release.git] / libcfs / include / libcfs / lucache.h

diff --git a/libcfs/include/libcfs/lucache.h b/libcfs/include/libcfs/lucache.h
index 0f80cdd..990ed79 100644 (file)
--- a/libcfs/include/libcfs/lucache.h
+++ b/libcfs/include/libcfs/lucache.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/
@@ -36,6 +38,7 @@
 #define _LUCACHE_H
 
 #include <libcfs/libcfs.h>
+#include <lnet/types.h>
 
 /** \defgroup ucache ucache
  *
@@ -72,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)
@@ -116,15 +119,15 @@ struct upcall_cache_ops {
 };
 
 struct upcall_cache {
-        cfs_list_t              uc_hashtable[UC_CACHE_HASH_SIZE];
-        cfs_spinlock_t          uc_lock;
-        cfs_rwlock_t            uc_upcall_rwlock;
-
-        char                    uc_name[40];            /* for upcall */
-        char                    uc_upcall[UC_CACHE_UPCALL_MAXPATH];
-        int                     uc_acquire_expire;      /* seconds */
-        int                     uc_entry_expire;        /* seconds */
-        struct upcall_cache_ops *uc_ops;
+       struct list_head        uc_hashtable[UC_CACHE_HASH_SIZE];
+       spinlock_t              uc_lock;
+       rwlock_t                uc_upcall_rwlock;
+
+       char                    uc_name[40];            /* for upcall */
+       char                    uc_upcall[UC_CACHE_UPCALL_MAXPATH];
+       int                     uc_acquire_expire;      /* seconds */
+       int                     uc_entry_expire;        /* seconds */
+       struct upcall_cache_ops *uc_ops;
 };
 
 struct upcall_cache_entry *upcall_cache_get_entry(struct upcall_cache *cache,