Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c75b9b10 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 1e2a2551

drivers/block/drbd/drbd_nl.c

+3 −3
Original line number Diff line number Diff line
@@ -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;