---

yaml --- r: 196879 b: refs/heads/master c: 31a31dc h: refs/heads/master i: 196877: 06f1ad5 196875: ffbf4f7 196871: b29eed4 196863: 85dcddb v: v3
git-mirror · May 21, 2010 · c9e0113 · c9e0113
1 parent 3bd6eb4
commit c9e0113
Show file tree

Hide file tree

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