X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirehdr.c;h=a8e307fd899beca57b3a2cbcfe725257e7f05b71;hb=1e4d10af3909452b0eee1f99010d80aeb01d42a7;hp=f337dce80f2a77687a12a689732dcf8c03893b2d;hpb=4c4f74b0a581e139f3bf3db1a41d2b11594c039f;p=fs%2Flustre-release.git

diff --git a/lustre/utils/wirehdr.c b/lustre/utils/wirehdr.c
index f337dce..a8e307f 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,23 +23,38 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, 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/lustre_lfsck_user.h>
-#include <lustre_disk.h>
+#include <string.h>
+
+#include <linux/lustre/lustre_idl.h>
+#include <linux/lustre/lustre_access_log.h>
+#ifdef HAVE_SERVER_SUPPORT
+#include <linux/lustre/lustre_lfsck_user.h>
+#include <linux/lustre/lustre_disk.h>
+#ifdef CONFIG_FS_POSIX_ACL
+#include <linux/posix_acl_xattr.h>
+#ifdef HAVE_STRUCT_POSIX_ACL_XATTR
+# 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>
+
+#ifndef BUILD_BUG_ON
+#define BUILD_BUG_ON(cond) ((void)sizeof(char[1 - 2*!!(cond)]))
+#endif
 
-#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;}
+#define LASSERTF(cond, fmt, ...) if (!(cond)) { printf("failed '" #cond "'" fmt, ## __VA_ARGS__); ret = 1; }
 
 int ret;
 
@@ -51,10 +62,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;
 }