X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fupcall_cache.h;h=1f02294b9660dbb93a068f0953146d5e7e458ac5;hb=771308ada3895c3ccfeb8e63365089086c1d9fdc;hp=88e1171d146884a78d2a9e1728e5f4ac6c041271;hpb=72057a3af19ee02d9a686bd7e7d074917e381310;p=fs%2Flustre-release.git

diff --git a/lustre/include/upcall_cache.h b/lustre/include/upcall_cache.h
index 88e1171..1f02294 100644
--- a/lustre/include/upcall_cache.h
+++ b/lustre/include/upcall_cache.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -34,7 +34,7 @@
 #define _UPCALL_CACHE_H
 
 #include <libcfs/libcfs.h>
-#include <lnet/types.h>
+#include <uapi/linux/lnet/lnet-types.h>
 
 /** \defgroup ucache ucache
  *
@@ -85,8 +85,8 @@ struct upcall_cache_entry {
 	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;
@@ -121,8 +121,8 @@ struct upcall_cache {
 
 	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;
 };