From 00245d8c4cc1daebbc366c934f980efc8229fb6e Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 30 Jul 2012 09:11:01 +0200 Subject: [PATCH] --- yaml --- r: 346223 b: refs/heads/master c: 6f1a656325ea01638de44f8d40bb77c73181b275 h: refs/heads/master i: 346221: e58a4ce47fa7f02cce5badd1231467ecc5505813 346219: c0bba9a2d1f076bf4bda5d1a6d421ce48ee55e07 346215: 67444068e925c44b45b964fefc4daa91598239bd 346207: 572805e08470cbf3e01aa4195388b7f120fb4d88 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2d3565ad9a81..05d4d6609fde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a324896b173e569fb831c5caa04ccd02ec0bc9ca +refs/heads/master: 6f1a656325ea01638de44f8d40bb77c73181b275 diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index ad307fb8dc28..444581828d70 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -1342,6 +1342,9 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, was_io_error = test_and_clear_bit(WAS_IO_ERROR, &mdev->flags); + if (was_io_error && eh == EP_CALL_HELPER) + drbd_khelper(mdev, "local-io-error"); + /* Immediately allow completion of all application IO, * that waits for completion from the local disk, * if this was a force-detach due to disk_timeout @@ -1377,9 +1380,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, drbd_md_sync(mdev); } put_ldev(mdev); - - if (was_io_error && eh == EP_CALL_HELPER) - drbd_khelper(mdev, "local-io-error"); } /* second half of local IO error, failure to attach,