LU-6245 libcfs: remove userland headers from libcfs.h

[fs/lustre-release.git] / lustre / utils / req-layout.c

diff --git a/lustre/utils/req-layout.c b/lustre/utils/req-layout.c
index 5c2d555..644e120 100644 (file)
--- a/lustre/utils/req-layout.c
+++ b/lustre/utils/req-layout.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,14 +40,20 @@
  * Author: Nikita Danilov <nikita@clusterfs.com>
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-#include <liblustre.h>
-#include <lustre/lustre_idl.h>
+#include <linux/types.h>
 
+#define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
 #define __REQ_LAYOUT_USER__ (1)
+#define EXPORT_SYMBOL(s)
+
+#include <lustre/lustre_idl.h>
+#include <lustre_req_layout.h>
 
 #define lustre_swab_generic_32s NULL
 #define lustre_swab_lu_seq_range NULL
@@ -91,9 +97,13 @@
 #define lustre_swab_hsm_state_set NULL
 #define lustre_swab_hsm_current_action NULL
 #define lustre_swab_hsm_request NULL
-#define lustre_swab_update_buf NULL
-#define lustre_swab_update_reply_buf NULL
 #define lustre_swab_close_data NULL
+#define lustre_swab_object_update NULL
+#define lustre_swab_object_update_result NULL
+#define lustre_swab_object_update_reply NULL
+#define lustre_swab_object_update_request NULL
+#define lustre_swab_out_update_header NULL
+#define lustre_swab_out_update_buffer NULL
 
 #define dump_rniobuf NULL
 #define dump_ioo NULL
@@ -131,7 +141,7 @@ void print_layout(const struct req_format *rf)
                 [RCL_SERVER] = "S"
         };
 
-        printf("L %s (%i/%i)\n", rf->rf_name,
+       printf("L %s (%zu/%zu)\n", rf->rf_name,
                rf->rf_fields[RCL_CLIENT].nr, rf->rf_fields[RCL_SERVER].nr);
 
         for (j = 0; j < RCL_NR; ++j) {