X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Freq-layout.c;h=49ec2517f154c0e357a80df3d5b1f7964ceb0f43;hb=7a814e94e065551ab79e2ba75df9626e4940efc5;hp=a0196c40f6253cdbd79cd9802519c1f354e493b1;hpb=0ea96fbfac0c5f4c6846d84360f53733198f95dd;p=fs%2Flustre-release.git

diff --git a/lustre/utils/req-layout.c b/lustre/utils/req-layout.c
index a0196c4..49ec251 100644
--- a/lustre/utils/req-layout.c
+++ b/lustre/utils/req-layout.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,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,14 +36,25 @@
  * Author: Nikita Danilov <nikita@clusterfs.com>
  */
 
+#include <errno.h>
+#include <limits.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 __REQ_LAYOUT_USER__ (1)
+#define EXPORT_SYMBOL(s)
+
+#include <lustre/lustre_idl.h>
+#include <lustre_req_layout.h>
+#include <lustre/lustreapi.h>
+
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
+#endif /* !ARRAY_SIZE */
 
 #define lustre_swab_generic_32s NULL
 #define lustre_swab_lu_seq_range NULL
@@ -59,6 +66,7 @@
 #define lustre_swab_ldlm_request NULL
 #define lustre_swab_ldlm_reply NULL
 #define lustre_swab_ldlm_intent NULL
+#define lustre_swab_layout_intent NULL
 /* #define lustre_swab_lov_mds_md NULL */
 #define lustre_swab_mdt_rec_reint NULL
 #define lustre_swab_lustre_capa NULL
@@ -67,7 +75,6 @@
 #define lustre_swab_llog_hdr NULL
 #define lustre_swab_llogd_body NULL
 #define lustre_swab_obd_quotactl NULL
-#define lustre_swab_quota_adjust_qunit NULL
 #define lustre_swab_mgs_target_info NULL
 #define lustre_swab_niobuf_remote NULL
 #define lustre_swab_obd_ioobj NULL
@@ -77,15 +84,38 @@
 #define lustre_swab_idx_info NULL
 #define lustre_swab_qdata NULL
 #define lustre_swab_quota_body NULL
-#define lustre_swab_lvb NULL
+#define lustre_swab_ost_lvb_v1 NULL
+#define lustre_swab_ost_lvb NULL
 #define lustre_swab_gl_desc NULL
 #define lustre_swab_mgs_config_body NULL
 #define lustre_swab_mgs_config_res NULL
+#define lustre_swab_swap_layouts NULL
+#define lustre_swab_lu_fid NULL
+#define lustre_swab_ost_id NULL
+#define lustre_swab_hsm_progress_kernel NULL
+#define lustre_swab_hsm_user_item NULL
+#define lustre_swab_hsm_user_state NULL
+#define lustre_swab_hsm_state_set NULL
+#define lustre_swab_hsm_current_action NULL
+#define lustre_swab_hsm_request 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
 #define dump_obdo NULL
 #define dump_ost_body NULL
 #define dump_rcs NULL
+#define lustre_swab_lmv_user_md NULL
+#define lustre_swab_lfsck_request NULL
+#define lustre_swab_lfsck_reply NULL
+#define lustre_swab_ladvise_hdr NULL
+#define lustre_swab_ladvise NULL
 
 /*
  * Yes, include .c file.
@@ -114,7 +144,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) {