From 500005817631f0296f231d9e82080b310ca793ef Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Wed, 17 Mar 2010 14:18:41 +0100
Subject: [PATCH] --- yaml --- r: 196835 b: refs/heads/master c:
 e4f925e12ea5daaa9baf2dd5af9c4951721dae95 h: refs/heads/master i:   196833:
 397751518b8bde3b76081a4b81d0a5485b341696   196831:
 2bdd1738771dcc702d102a73822d77b4f1965067 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/block/drbd/drbd_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ae162bd59ca..2ca7b9c3c083 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c484ee4910b36c9ac273ad1150261c6ebfc1ef7
+refs/heads/master: e4f925e12ea5daaa9baf2dd5af9c4951721dae95
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
index db7a07a9a2cf..8f84a9f58c99 100644
--- a/trunk/drivers/block/drbd/drbd_main.c
+++ b/trunk/drivers/block/drbd/drbd_main.c
@@ -840,7 +840,7 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
 			break;
 		case C_WF_BITMAP_S:
 		case C_PAUSED_SYNC_S:
-			ns.pdsk = D_OUTDATED;
+			ns.pdsk = os.pdsk > D_OUTDATED ? D_OUTDATED : os.pdsk;
 			break;
 		case C_SYNC_SOURCE:
 			ns.pdsk = D_INCONSISTENT;