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

Commit 148efa16 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Do not drop net config if sending in drbd_send_protocol() fails 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 370a43e7

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,7 @@ int drbd_send_protocol(struct drbd_conf *mdev) 
		else {

			dev_err(DEV, "--dry-run is not supported by peer");

			kfree(p);

			return 0;

			return -1;

		}

	}

	p->conn_flags    = cpu_to_be32(cf);

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int drbd_connect(struct drbd_conf *mdev) 
		put_ldev(mdev);

	}



	if (!drbd_send_protocol(mdev))

	if (drbd_send_protocol(mdev) == -1)

		return -1;

	drbd_send_sync_param(mdev, &mdev->sync_conf);

	drbd_send_sizes(mdev, 0, 0);