drbd: Do not drop net config if sending in drbd_send_protocol() fails
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Родитель
370a43e798
Коммит
148efa165e
|
@ -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);
|
||||
|
|
|
@ -906,7 +906,7 @@ retry:
|
|||
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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче