summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2013-03-27 14:08:34 +0100
committerJens Axboe <axboe@kernel.dk>2013-03-28 17:10:24 +0100
commit2d56a974f36ffd1d00aa897bd55e28079aa9e5b7 (patch)
tree1b621190cc2a44433466004e923d5b87cac1fbd1 /drivers/block/drbd
parentidr: document exit conditions on idr_for_each_entry better (diff)
downloadlinux-2d56a974f36ffd1d00aa897bd55e28079aa9e5b7.tar.xz
linux-2d56a974f36ffd1d00aa897bd55e28079aa9e5b7.zip
drbd: reset ap_in_flight counter for new connections
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_receiver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 1921871ca9a8..cd172b490a95 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -849,6 +849,7 @@ int drbd_connected(struct drbd_conf *mdev)
err = drbd_send_current_state(mdev);
clear_bit(USE_DEGR_WFC_T, &mdev->flags);
clear_bit(RESIZE_PENDING, &mdev->flags);
+ atomic_set(&mdev->ap_in_flight, 0);
mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */
return err;
}