mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 10:36:51 +07:00
drbd: Don't use empty nested netlink attributes
Before mainline commit ea5693cc
(v2.6.29-rc1), empty nested netlink attributes
were not allowed. Fix that by leaving out nested attributes if they are empty
and by allowing the top-level attributes to be missing.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
1e2a2551ee
commit
c75b9b10e7
@ -1155,7 +1155,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
|
||||
set_disk_conf_defaults(new_disk_conf);
|
||||
|
||||
err = disk_conf_from_attrs_for_change(new_disk_conf, info);
|
||||
if (err) {
|
||||
if (err && err != -ENOMSG) {
|
||||
retcode = ERR_MANDATORY_TAG;
|
||||
drbd_msg_put_info(from_attrs_err_to_txt(err));
|
||||
}
|
||||
@ -1902,7 +1902,7 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
|
||||
set_net_conf_defaults(new_conf);
|
||||
|
||||
err = net_conf_from_attrs_for_change(new_conf, info);
|
||||
if (err) {
|
||||
if (err && err != -ENOMSG) {
|
||||
retcode = ERR_MANDATORY_TAG;
|
||||
drbd_msg_put_info(from_attrs_err_to_txt(err));
|
||||
goto fail;
|
||||
@ -2337,7 +2337,7 @@ int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info)
|
||||
set_res_opts_defaults(&res_opts);
|
||||
|
||||
err = res_opts_from_attrs(&res_opts, info);
|
||||
if (err) {
|
||||
if (err && err != -ENOMSG) {
|
||||
retcode = ERR_MANDATORY_TAG;
|
||||
drbd_msg_put_info(from_attrs_err_to_txt(err));
|
||||
goto fail;
|
||||
|
Loading…
Reference in New Issue
Block a user