From 7262f15ac31f9057969f023da060f3306102b667 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Mon, 14 Mar 2011 13:22:35 +0100
Subject: [PATCH] --- yaml --- r: 345863 b: refs/heads/master c:
 38f19616d2c6d4e0ab2de01e4c2f159cd5aa8b49 h: refs/heads/master i:   345861:
 77b0b1aa16813aa4afa26446183eca38e09ae4d0   345859:
 ad72ed5597651fb0c5e1521cd73e669eafab107d   345855:
 7dcdeb1fef61092eeba92df0338d84f3aabaef16 v: v3

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

diff --git a/[refs] b/[refs]
index 3039725da2f9..1213e2982d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cffec5b2fe8e851f54bb67a9012add062a97b960
+refs/heads/master: 38f19616d2c6d4e0ab2de01e4c2f159cd5aa8b49
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index 9b0312f2d2f8..0d3753be371c 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -2590,8 +2590,11 @@ int drbd_adm_create_connection(struct sk_buff *skb, struct genl_info *info)
 		goto out;
 
 	if (adm_ctx.tconn) {
-		retcode = ERR_INVALID_REQUEST;
-		drbd_msg_put_info("connection exists");
+		if (info->nlhdr->nlmsg_flags & NLM_F_EXCL) {
+			retcode = ERR_INVALID_REQUEST;
+			drbd_msg_put_info("connection exists");
+		}
+		/* else: still NO_ERROR */
 		goto out;
 	}
 
@@ -2626,6 +2629,15 @@ int drbd_adm_add_minor(struct sk_buff *skb, struct genl_info *info)
 		goto out;
 	}
 
+	/* drbd_adm_prepare made sure already
+	 * that mdev->tconn and mdev->vnr match the request. */
+	if (adm_ctx.mdev) {
+		if (info->nlhdr->nlmsg_flags & NLM_F_EXCL)
+			retcode = ERR_MINOR_EXISTS;
+		/* else: still NO_ERROR */
+		goto out;
+	}
+
 	retcode = conn_new_minor(adm_ctx.tconn, dh->minor, adm_ctx.volume);
 out:
 	drbd_adm_finish(info, retcode);