diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-01-14 18:21:15 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:45:37 -0500 |
commit | 148efa165e9464927887b03c83a52c33b80b4431 (patch) | |
tree | 2c13039e139600b7d9347211cc714f90df01c6b3 /drivers/block/drbd/drbd_main.c | |
parent | 370a43e7982dd497822097e0ae6022947ac2e7d4 (diff) |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 8ec7c65988be..1061b9fff2b0 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -1967,7 +1967,7 @@ int drbd_send_protocol(struct drbd_conf *mdev) | |||
1967 | else { | 1967 | else { |
1968 | dev_err(DEV, "--dry-run is not supported by peer"); | 1968 | dev_err(DEV, "--dry-run is not supported by peer"); |
1969 | kfree(p); | 1969 | kfree(p); |
1970 | return 0; | 1970 | return -1; |
1971 | } | 1971 | } |
1972 | } | 1972 | } |
1973 | p->conn_flags = cpu_to_be32(cf); | 1973 | p->conn_flags = cpu_to_be32(cf); |