osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Lustre: Fix conflict 

'lustre.mdt_rec_reint.size' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'lustre.ldlm_res_id.name' exists multiple times with NOT compatible types: FT_STRING and FT_UINT64

Change-Id: I2706ac7c9866e4b435e6bd3c235fb67f1833af70
Reviewed-on: https://code.wireshark.org/review/34909
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2019-11-02 14:53:32 +01:00 committed by Anders Broman
parent b6c31d5db7
commit 05e37a386e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-lustre.c
View File

@ -7062,7 +7062,7 @@ proto_register_lustre(void)
{ &hf_lustre_mdt_rec_reint_ctime,
{ "Cr Time", "lustre.mdt_rec_reint.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL } },
{ &hf_lustre_mdt_rec_reint_size64,
{ "Size", "lustre.mdt_rec_reint.size", FT_UINT64, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
{ "Size", "lustre.mdt_rec_reint.size64", FT_UINT64, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
{ &hf_lustre_mdt_rec_reint_blocks,
{ "Blocks", "lustre.mdt_rec_reint.blocks", FT_UINT64, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
{ &hf_lustre_mdt_rec_reint_bias,
@ -7081,7 +7081,7 @@ proto_register_lustre(void)
{ &hf_lustre_mdt_rec_reint_time,
{ "Time", "lustre.mdt_rec_reint.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL } },
{ &hf_lustre_mdt_rec_reint_size32,
{ "Size", "lustre.mdt_rec_reint.size", FT_UINT32, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
{ "Size", "lustre.mdt_rec_reint.size32", FT_UINT32, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
{ &hf_lustre_mdt_rec_reint_rdev,
{ "RDev", "lustre.mdt_rec_reint.rdev", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_lustre_mdt_rec_reint_ioepoch,
@ -7969,9 +7969,9 @@ proto_register_lustre(void)
{ &hf_lustre_ldlm_res_id_name,
{ "Name", "lustre.ldlm_res_id.name", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_lustre_ldlm_res_id_bits,
{ "Name", "lustre.ldlm_res_id.name", FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
{ "Bits", "lustre.ldlm_res_id.bits", FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_lustre_ldlm_res_id_string,
{ "Name", "lustre.ldlm_res_id.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ "String", "lustre.ldlm_res_id.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_lustre_ldlm_res_id_type,
{ "Type", "lustre.ldlm_res_id.type", FT_UINT32, BASE_HEX, VALS(mgs_config_body_type_vals), 0, NULL, HFILL }},