---

yaml --- r: 345958 b: refs/heads/master c: 438c837 h: refs/heads/master v: v3
git-mirror · Nov 8, 2012 · 1302b57 · 1302b57
1 parent 3b34a3a
commit 1302b57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778bcf2e290fc9f13735c32640cdafb34794ebd1
+refs/heads/master: 438c8374ae3e87f44d945a2ac2901e3b14aec1a8
diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c
@@ -1319,6 +1319,8 @@ static int _drbd_may_sync_now(struct drbd_conf *mdev)
 	struct drbd_conf *odev = mdev;
 
 	while (1) {
+		if (!odev->ldev)
+			return 1;
 		if (odev->ldev->dc.resync_after == -1)
 			return 1;
 		odev = minor_to_mdev(odev->ldev->dc.resync_after);