diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2013-06-25 14:50:06 (GMT) |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2013-06-28 14:04:36 (GMT) |
commit | 28e448bb30d0f3fc7daa652d2d3a30adaf9e171b (patch) | |
tree | a55a604af453136e8021e62f4ab9656e7a3da4ec /drivers/block/drbd/drbd_state.c | |
parent | f9eb7bf424e766e00bbc6d69fd7eaaf4bd003cf9 (diff) | |
download | linux-28e448bb30d0f3fc7daa652d2d3a30adaf9e171b.tar.xz |
drbd: Ignore the exit code of a fence-peer handler if it returns too late
In case the connection was established and lost again before
the a fence-peer handler returns, ignore the exit code of this
instance. (And use the exit code of the later started instance)
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
-rw-r--r-- | drivers/block/drbd/drbd_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 90c5be2..216d47b 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1115,8 +1115,10 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, drbd_thread_restart_nowait(&mdev->tconn->receiver); /* Resume AL writing if we get a connection */ - if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED) + if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED) { drbd_resume_al(mdev); + mdev->tconn->connect_cnt++; + } /* remember last attach time so request_timer_fn() won't * kill newly established sessions while we are still trying to thaw |