X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fupcall_cache.h;h=1f02294b9660dbb93a068f0953146d5e7e458ac5;hb=acd639bf0de0c39419dff94fd6d338283a1ddb24;hp=d239a265552b0101ca5096d3ccb799958c0dded5;hpb=e8273a3dd71c4e6ab5ca9de3fbfbc0f7603d6930;p=fs%2Flustre-release.git

diff --git a/lustre/include/upcall_cache.h b/lustre/include/upcall_cache.h
index d239a26..1f02294 100644
--- 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
- * 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
  */
@@ -27,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/
@@ -38,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
  *
@@ -89,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;
@@ -125,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;
 };