From f294d942671b4c4c399f88b475d2dcf93a49ae05 Mon Sep 17 00:00:00 2001 From: Doug Oucharek Date: Mon, 8 Apr 2013 21:30:07 -0700 Subject: [PATCH] LU-3134 utils: Fix compilation errors in packet_lustre.c There are compilation errors in packet_lustre.c when building Wireshark plugins. This was introduced in http://review.whamcloud.com/#change,2877. That patch was deleting llog variables no longer needed. Not all instances got deleted. Signed-off-by: Doug Oucharek Change-Id: Ica97df78e2a3e7b1667cc88484342b97a6c6a01a Reviewed-on: http://review.whamcloud.com/5980 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Andreas Dilger --- lustre/contrib/wireshark/packet-lustre.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lustre/contrib/wireshark/packet-lustre.c b/lustre/contrib/wireshark/packet-lustre.c index b795829..9db8211 100644 --- a/lustre/contrib/wireshark/packet-lustre.c +++ b/lustre/contrib/wireshark/packet-lustre.c @@ -10619,9 +10619,6 @@ void proto_register_dcerpc_lustre(void) { "Qd Id", "lustre.qunit_data_old2.qd_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_llog_logid_rec_padding2, { "Padding2", "lustre.llog_logid_rec.padding2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_lustre_llog_orphan_rec_lor_tail, - { "Lor Tail", "lustre.llog_orphan_rec.lor_tail", FT_NONE, - BASE_NONE, NULL, 0, "", HFILL } }, { &hf_lustre_llog_logid_rec_padding5, { "Padding5", "lustre.llog_logid_rec.padding5", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, /*-------------------------------------------------------------------------------------------------------------*/ @@ -10805,9 +10802,6 @@ void proto_register_dcerpc_lustre(void) { "Ld Padding 0", "lustre.lov_desc.ld_padding_0", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_llog_unlink_rec_lur_ogen, { "Lur Ogen", "lustre.llog_unlink_rec.lur_ogen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_lustre_llog_orphan_rec_lor_hdr, - { "Lor Hdr", "lustre.llog_orphan_rec.lor_hdr", FT_NONE, - BASE_NONE, NULL, 0, "", HFILL } }, { &hf_lustre_cfg_marker_cm_flags, { "Cm Flags", "lustre.cfg_marker.cm_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_obdo_o_padding_3, @@ -10815,8 +10809,6 @@ void proto_register_dcerpc_lustre(void) { &hf_lustre_ldlm_request_lock_desc, { "Lock Desc", "lustre.ldlm_request.lock_desc", FT_NONE, BASE_NONE, NULL, 0, "", HFILL } }, - { &hf_lustre_llog_orphan_rec_padding, - { "Padding", "lustre.llog_orphan_rec.padding", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_obdo_o_flags, { "O Flags", "lustre.obdo.o_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_mgs_target_info_mti_params, @@ -10867,8 +10859,6 @@ void proto_register_dcerpc_lustre(void) { &hf_lustre_llog_gen_rec_lgr_hdr, { "Lgr Hdr", "lustre.llog_gen_rec.lgr_hdr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL } }, - { &hf_lustre_llog_orphan_rec_lor_ogen, - { "Lor Ogen", "lustre.llog_orphan_rec.lor_ogen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_llogd_body_lgd_llh_flags, { "Lgd Llh Flags", "lustre.llogd_body.lgd_llh_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_lustre_llog_log_hdr_llh_cat_idx, @@ -11176,7 +11166,6 @@ void proto_register_dcerpc_lustre(void) &ett_lustre_llog_rec_hdr, &ett_lustre_llog_rec_tail, &ett_lustre_llog_logid_rec, - &ett_lustre_llog_orphan_rec, &ett_lustre_llog_unlink_rec, &ett_lustre_llog_setattr_rec, &ett_lustre_llog_size_change_rec, -- 1.8.3.1