From f85e036ef521671f9335d90c3e1ef55429ceb3cf Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 10 Jun 2010 16:46:54 +0200 Subject: [PATCH] --- yaml --- r: 213104 b: refs/heads/master c: 999122bc188a4d0a4847bdf1915d357bd6ab53dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9e1953369d4..ff701ed6f728 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a50fa213d46d5592f6542c91ab4c4760cf346c +refs/heads/master: 999122bc188a4d0a4847bdf1915d357bd6ab53dc diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index c701805ed4b9..c502648b7b40 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -847,9 +847,6 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state if (ns.conn == C_STANDALONE && ns.disk == D_DISKLESS && ns.role == R_SECONDARY) ns.aftr_isp = 0; - if (ns.conn <= C_DISCONNECTING && ns.disk == D_DISKLESS) - ns.pdsk = D_UNKNOWN; - /* Abort resync if a disk fails/detaches */ if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED && (ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) {