From c9e01130faad61741f4ce6bc9fc36115e68929be Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Wed, 19 May 2010 16:28:28 +0200
Subject: [PATCH] --- yaml --- r: 196879 b: refs/heads/master c:
 31a31dccdd308d5ec7f9a1197a7875a246a348dc h: refs/heads/master i:   196877:
 06f1ad516dfbdb2eb0a1b9a2f8f354981224da86   196875:
 ffbf4f7a3c32b5da655b9d520ef06f2c4ae6f711   196871:
 b29eed454437f4c66f732a042f8d375c2f31ec3e   196863:
 85dcddb21b48e32c91a2c401620a6d967a843d9c v: v3

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

diff --git a/[refs] b/[refs]
index 31dccae42a42..0fb8c9b3dd99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df96e96f76571c30d903829a7b2ab2b421028790
+refs/heads/master: 31a31dccdd308d5ec7f9a1197a7875a246a348dc
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
index c144509011b8..7e057b074bbd 100644
--- a/trunk/drivers/block/drbd/drbd_main.c
+++ b/trunk/drivers/block/drbd/drbd_main.c
@@ -1354,7 +1354,10 @@ static int w_new_current_uuid(struct drbd_conf *mdev, struct drbd_work *w, int c
 {
 	if (get_ldev(mdev)) {
 		drbd_uuid_new_current(mdev);
-		drbd_send_uuids(mdev);
+		if (get_net_conf(mdev)) {
+			drbd_send_uuids(mdev);
+			put_net_conf(mdev);
+		}
 		drbd_md_sync(mdev);
 		put_ldev(mdev);
 	}