X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwirehdr.c;h=f9f33d93954a89328edabceeb8ca62b2df53de10;hp=6bf14b7ac1af1a51857a32bcb3cbfed82708b1c0;hb=c30da8bfa199205194eefca2c5d2e6843a29a34b;hpb=281671b5ee43c2aea5d5b708aadf10fd1df45b16

diff --git a/lustre/utils/wirehdr.c b/lustre/utils/wirehdr.c
index 6bf14b7..f9f33d9 100644
--- a/lustre/utils/wirehdr.c
+++ b/lustre/utils/wirehdr.c
@@ -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,22 +23,39 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
-#include <libcfs/libcfs.h>
-#include <lustre/lustre_idl.h>
-#include <lustre_disk.h>
+#include <string.h>
+
+#include <linux/lustre/lustre_idl.h>
+#ifdef HAVE_SERVER_SUPPORT
+#include <linux/lustre/lustre_lfsck_user.h>
+#include <linux/lustre/lustre_disk.h>
+#ifdef CONFIG_FS_POSIX_ACL
+#ifdef HAVE_STRUCT_POSIX_ACL_XATTR
+#include <linux/posix_acl_xattr.h>
+# define posix_acl_xattr_header struct posix_acl_xattr_header
+# define posix_acl_xattr_entry  struct posix_acl_xattr_entry
+#endif /* HAVE_STRUCT_POSIX_ACL_XATTR */
+#endif /* CONFIG_FS_POSIX_ACL */
+#endif /* HAVE_SERVER_SUPPORT */
+#include <linux/lustre/lustre_cfg.h>
 
-#undef LASSERT
-#undef LASSERTF
 #define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
 #define LASSERTF(cond, fmt, ...) if (!(cond)) { printf("failed '" #cond "'" fmt, ## __VA_ARGS__);ret = 1;}
+/*
+ * BUILD_BUG_ON() is Compile-time check which verifies correctness at
+ * compile-time rather than runtime.
+ */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
 int ret;
 
@@ -50,10 +63,10 @@ void lustre_assert_wire_constants(void);
 
 int main()
 {
-        lustre_assert_wire_constants();
+	lustre_assert_wire_constants();
 
-        if (ret == 0)
-                printf("wire constants OK\n");
+	if (ret == 0)
+		printf("wire constants OK\n");
 
-        return ret;
+	return ret;
 }