From ec9a7fb71216e55b2ff71ce91e35cc33413ef785 Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Sat, 15 Jan 2011 00:21:15 +0100
Subject: [PATCH] --- yaml --- r: 242891 b: refs/heads/master c:
 148efa165e9464927887b03c83a52c33b80b4431 h: refs/heads/master i:   242889:
 1b3c8ba13de42a958cb21f2da3930cf01d011877   242887:
 36090d976e91c844c8007de060c9afd3a6ed041b v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/block/drbd/drbd_main.c     | 2 +-
 trunk/drivers/block/drbd/drbd_receiver.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a09b1c21781e..8c5ee065be8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 370a43e7982dd497822097e0ae6022947ac2e7d4
+refs/heads/master: 148efa165e9464927887b03c83a52c33b80b4431
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
index 8ec7c65988be..1061b9fff2b0 100644
--- a/trunk/drivers/block/drbd/drbd_main.c
+++ b/trunk/drivers/block/drbd/drbd_main.c
@@ -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);
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
index 18cb8b609fe4..fb8e86153fd0 100644
--- a/trunk/drivers/block/drbd/drbd_receiver.c
+++ b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -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);