Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8ce194 authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: Fix: Do not detach, if a bio with a barrier fails 



Introduced a few days ago:
  commit 45bb912b
  Author: Lars Ellenberg <lars.ellenberg@linbit.com>
  Date:   Fri May 14 17:10:48 2010 +0200

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4604d636

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

		drbd_bump_write_ordering(mdev, WO_bdev_flush);

		spin_lock_irqsave(&mdev->req_lock, flags);

		spin_lock_irqsave(&mdev->req_lock, flags);

		list_del(&e->w.list);

		list_del(&e->w.list);

		e->flags |= EE_RESUBMITTED;

		e->flags = (e->flags & ~EE_WAS_ERROR) | EE_RESUBMITTED;

		e->w.cb = w_e_reissue;

		e->w.cb = w_e_reissue;

		/* put_ldev actually happens below, once we come here again. */

		/* put_ldev actually happens below, once we come here again. */

		__release(local);

		__release(local);