---

yaml --- r: 346293 b: refs/heads/master c: 298307e h: refs/heads/master i: 346291: 2a07ef7 v: v3
git-mirror · Dec 6, 2012 · dbcf24b · dbcf24b
1 parent 1b2cc0c
commit dbcf24b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84ad6845fbb1248228d3beab8084e4b5f6f82b1d
+refs/heads/master: 298307ed1d2ac4815b0ce9a5f1c9cc643f4a9aca
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
@@ -840,7 +840,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)
 	}
 	spin_lock_irq(&mdev->ldev->md.uuid_lock);
 	for (i = UI_CURRENT; i < UI_SIZE; i++)
-		p->uuid[i] = mdev->ldev ? cpu_to_be64(mdev->ldev->md.uuid[i]) : 0;
+		p->uuid[i] = cpu_to_be64(mdev->ldev->md.uuid[i]);
 	spin_unlock_irq(&mdev->ldev->md.uuid_lock);
 
 	mdev->comm_bm_set = drbd_bm_total_weight(mdev);