---

yaml --- r: 242891 b: refs/heads/master c: 148efa1 h: refs/heads/master i: 242889: 1b3c8ba 242887: 36090d9 v: v3
git-mirror · Mar 10, 2011 · ec9a7fb · ec9a7fb
1 parent d3a8d81
commit ec9a7fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);