X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustre_user.h;h=bb808e851c492a33742475c75624d3675e060b4f;hp=d49c8c947032757765e54dbabda1515197269943;hb=bbadfbefd9e0323172ad0a37b4268e68bf0968b7;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;ds=sidebyside

diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index d49c8c9..bb808e8 100644
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -49,12 +49,28 @@
 #include <libcfs/types.h>
 
 #ifdef __KERNEL__
+# include <linux/quota.h>
 # include <linux/string.h> /* snprintf() */
-#else
+# include <linux/version.h>
+#else /* !__KERNEL__ */
+# define NEED_QUOTA_DEFS
 # include <stdio.h> /* snprintf() */
-#endif
+# include <string.h>
+# include <sys/quota.h>
+# include <sys/stat.h>
+#endif /* __KERNEL__ */
 #include <lustre/ll_fiemap.h>
-#include <linux/lustre_user.h>
+
+#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || \
+    defined(__craynv) || defined(__mips64__) || defined(__powerpc64__)
+typedef struct stat	lstat_t;
+# define lstat_f	lstat
+# define HAVE_LOV_USER_MDS_DATA
+#elif defined(__USE_LARGEFILE64) || defined(__KERNEL__)
+typedef struct stat64	lstat_t;
+# define lstat_f	lstat64
+# define HAVE_LOV_USER_MDS_DATA
+#endif
 
 #define LUSTRE_EOF 0xffffffffffffffffULL
 
@@ -1181,7 +1197,7 @@ static inline ssize_t hur_len(struct hsm_user_request *hur)
 		(__u64)hur->hur_request.hr_itemcount *
 		sizeof(hur->hur_user_item[0]) + hur->hur_request.hr_data_len;
 
-	if (size > ~((size_t)0)>>1)
+	if (size != (ssize_t)size)
 		return -1;
 
 	return size;