diff options
| author | Philipp Reisner | 2011-07-18 15:45:15 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:01 +0100 |
| commit | 85d735138a6ee343fe689e308163cf48bb54d162 (patch) | |
| tree | b8344e3145192af22f0e18bc663fc663654e7972 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: The minor_count module parameter is only a hint nowadays (diff) | |
| download | kernel-qcow2-linux-85d735138a6ee343fe689e308163cf48bb54d162.tar.gz kernel-qcow2-linux-85d735138a6ee343fe689e308163cf48bb54d162.tar.xz kernel-qcow2-linux-85d735138a6ee343fe689e308163cf48bb54d162.zip | |
drbd: Cleanup all epoch objects upon connection loss
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index fff55657e0da..cd140bc0b56f 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1125,13 +1125,14 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, if (epoch_size != 0 && atomic_read(&epoch->active) == 0 && - test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags)) { + (test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags) || ev & EV_CLEANUP)) { if (!(ev & EV_CLEANUP)) { spin_unlock(&mdev->epoch_lock); drbd_send_b_ack(mdev, epoch->barrier_nr, epoch_size); spin_lock(&mdev->epoch_lock); } - dec_unacked(mdev); + if (test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags)) + dec_unacked(mdev); if (mdev->current_epoch != epoch) { next_epoch = list_entry(epoch->list.next, struct drbd_epoch, list); |