Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13722 utils: lnetctl discrepancy in YAML output
[fs/lustre-release.git]
/
lnet
/
utils
/
lnetconfig
/
liblnetconfig.c
diff --git
a/lnet/utils/lnetconfig/liblnetconfig.c
b/lnet/utils/lnetconfig/liblnetconfig.c
index
c815732
..
e371771
100644
(file)
--- a/
lnet/utils/lnetconfig/liblnetconfig.c
+++ b/
lnet/utils/lnetconfig/liblnetconfig.c
@@
-3710,7
+3710,7
@@
int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc,
}
return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
}
return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
- "max_int
f
", max_intf, show_rc,
+ "max_int
erfaces
", max_intf, show_rc,
err_rc, l_errno);
}
err_rc, l_errno);
}
@@
-4735,7
+4735,9
@@
static int handle_yaml_config_global_settings(struct cYAML *tree,
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_config_max_intf(max_intf->cy_valueint,
seq_no ? seq_no->cy_valueint
if (max_intf)
rc = lustre_lnet_config_max_intf(max_intf->cy_valueint,
seq_no ? seq_no->cy_valueint
@@
-4823,7
+4825,9
@@
static int handle_yaml_del_global_settings(struct cYAML *tree,
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_config_max_intf(LNET_INTERFACES_MAX_DEFAULT,
seq_no ? seq_no->cy_valueint
if (max_intf)
rc = lustre_lnet_config_max_intf(LNET_INTERFACES_MAX_DEFAULT,
seq_no ? seq_no->cy_valueint
@@
-4864,7
+4868,9
@@
static int handle_yaml_show_global_settings(struct cYAML *tree,
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_show_max_intf(seq_no ? seq_no->cy_valueint
: -1,
if (max_intf)
rc = lustre_lnet_show_max_intf(seq_no ? seq_no->cy_valueint
: -1,