Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6142 lustre: use list_first_entry() in lustre subdirectory.
[fs/lustre-release.git]
/
lustre
/
include
/
upcall_cache.h
diff --git
a/lustre/include/upcall_cache.h
b/lustre/include/upcall_cache.h
index
46cfe65
..
6ac4a40
100644
(file)
--- a/
lustre/include/upcall_cache.h
+++ b/
lustre/include/upcall_cache.h
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,18
+23,17
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*/
#ifndef _UPCALL_CACHE_H
#define _UPCALL_CACHE_H
#include <libcfs/libcfs.h>
*/
#ifndef _UPCALL_CACHE_H
#define _UPCALL_CACHE_H
#include <libcfs/libcfs.h>
-#include <
lnet/
types.h>
+#include <
uapi/linux/lnet/lnet-
types.h>
/** \defgroup ucache ucache
*
/** \defgroup ucache ucache
*
@@
-89,8
+84,8
@@
struct upcall_cache_entry {
atomic_t ue_refcount;
int ue_flags;
wait_queue_head_t ue_waitq;
atomic_t ue_refcount;
int ue_flags;
wait_queue_head_t ue_waitq;
-
cfs_time_t
ue_acquire_expire;
-
cfs_time_t
ue_expire;
+
time64_t
ue_acquire_expire;
+
time64_t
ue_expire;
union {
struct md_identity identity;
} u;
union {
struct md_identity identity;
} u;
@@
-121,12
+116,12
@@
struct upcall_cache_ops {
struct upcall_cache {
struct list_head uc_hashtable[UC_CACHE_HASH_SIZE];
spinlock_t uc_lock;
struct upcall_cache {
struct list_head uc_hashtable[UC_CACHE_HASH_SIZE];
spinlock_t uc_lock;
-
rwlock_t uc_upcall_rwlock
;
+
struct rw_semaphore uc_upcall_rwsem
;
char uc_name[40]; /* for upcall */
char uc_upcall[UC_CACHE_UPCALL_MAXPATH];
char uc_name[40]; /* for upcall */
char uc_upcall[UC_CACHE_UPCALL_MAXPATH];
-
int
uc_acquire_expire; /* seconds */
-
int
uc_entry_expire; /* seconds */
+
time64_t
uc_acquire_expire; /* seconds */
+
time64_t
uc_entry_expire; /* seconds */
struct upcall_cache_ops *uc_ops;
};
struct upcall_cache_ops *uc_ops;
};