From 1302b5713c7e1384553ed69a3b6b17400e289b22 Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Mon, 28 Mar 2011 14:48:01 +0200
Subject: [PATCH] --- yaml --- r: 345958 b: refs/heads/master c:
 438c8374ae3e87f44d945a2ac2901e3b14aec1a8 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/block/drbd/drbd_worker.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d5311a61f1c..cb151a5da689 100644
--- 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
index cbbc5c7cbef4..c3d1f5f5853a 100644
--- 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);