From e16d028417653166e4af3f030a7d19b9647beb37 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 14 Mar 2011 11:54:47 +0100 Subject: [PATCH] --- yaml --- r: 251275 b: refs/heads/master c: d2e17807e3799bae24664a92f4d2d3dade021e00 h: refs/heads/master i: 251273: 10563c2a26dc043066a1853c16b5d3e03b390684 251271: 77123409a193be75028c23ac893b2d145eac968e v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b4f0e9e5dd1..3fd33dcbf087 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f36af18c7b4ea1ba333c09b606bb4a7e5af66b4d +refs/heads/master: d2e17807e3799bae24664a92f4d2d3dade021e00 diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index 2c38752ca8d6..5c994739d11e 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -1827,7 +1827,8 @@ static inline void __drbd_chk_io_error_(struct drbd_conf *mdev, int forcedetach, if (!forcedetach) { if (__ratelimit(&drbd_ratelimit_state)) dev_err(DEV, "Local IO failed in %s.\n", where); - _drbd_set_state(_NS(mdev, disk, D_INCONSISTENT), CS_HARD, NULL); + if (mdev->state.disk > D_INCONSISTENT) + _drbd_set_state(_NS(mdev, disk, D_INCONSISTENT), CS_HARD, NULL); break; } /* NOTE fall through to detach case if forcedetach set */