diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-20 10:04:17 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 21:12:00 +0200 |
| commit | fc8ce1941d668c70e57a07f13f5a63e73e5dbff3 (patch) | |
| tree | ac7fddba37671fb74b414a2ff9532ac0d424ca72 /drivers/block | |
| parent | 4604d6366859f781ad16c07a6c65b16fc96e26c5 (diff) | |
| download | linux-fc8ce1941d668c70e57a07f13f5a63e73e5dbff3.tar.bz2 | |
drbd: Fix: Do not detach, if a bio with a barrier fails
Introduced a few days ago:
commit 45bb912bd5ea4d2b3a270a93cbdf767a0e2df6f5
Author: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri May 14 17:10:48 2010 +0200
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 91085c1ab52f..15c96207e626 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -127,7 +127,7 @@ static void drbd_endio_write_sec_final(struct drbd_epoch_entry *e) __releases(lo drbd_bump_write_ordering(mdev, WO_bdev_flush); spin_lock_irqsave(&mdev->req_lock, flags); list_del(&e->w.list); - e->flags |= EE_RESUBMITTED; + e->flags = (e->flags & ~EE_WAS_ERROR) | EE_RESUBMITTED; e->w.cb = w_e_reissue; /* put_ldev actually happens below, once we come here again. */ __release(local); |