Groups > linux.kernel > #1420908

[PATCH 19/30] drbd: only restart frozen disk io when D_UP_TO_DATE

Path	csiph.com!goblin2!goblin1!goblin.stu.neva.ru!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Philipp Reisner <philipp.reisner@linbit.com>
Newsgroups	linux.kernel
Subject	[PATCH 19/30] drbd: only restart frozen disk io when D_UP_TO_DATE
Date	Mon, 13 Jun 2016 16:20:02 +0200
Message-ID	<rJASC-7p1-41@gated-at.bofh.it> (permalink)
References	<rJASB-7p1-3@gated-at.bofh.it>
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	27
Organization	linux.* mail to news gateway
X-Original-Cc	drbd-dev@lists.linbit.com
X-Original-Date	Mon, 13 Jun 2016 16:09:07 +0200
X-Original-Message-ID	<1465826958-19398-20-git-send-email-philipp.reisner@linbit.com>
X-Original-References	<1465826958-19398-1-git-send-email-philipp.reisner@linbit.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1420908

Show key headers only | View raw

From: Lars Ellenberg <lars.ellenberg@linbit.com>

When re-attaching the local backend device to a C_STANDALONE D_DISKLESS
R_PRIMARY with OND_SUSPEND_IO, we may only resume IO if we recognize the
backend that is being attached as D_UP_TO_DATE.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
 drivers/block/drbd/drbd_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 59c6467..24422e8 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -1675,7 +1675,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os,
 			what = RESEND;
 
 		if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) &&
-		    conn_lowest_disk(connection) > D_NEGOTIATING)
+		    conn_lowest_disk(connection) == D_UP_TO_DATE)
 			what = RESTART_FROZEN_DISK_IO;
 
 		if (resource->susp_nod && what != NOTHING) {
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 19/30] drbd: only restart frozen disk io when D_UP_TO_DATE Philipp Reisner <philipp.reisner@linbit.com> - 2016-06-13 16:20 +0200

csiph-web