From d5f8c4d4949afa2489adb0e3719bad6afb83f3db Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 20 May 2010 10:04:17 +0200 Subject: [PATCH] --- yaml --- r: 196881 b: refs/heads/master c: fc8ce1941d668c70e57a07f13f5a63e73e5dbff3 h: refs/heads/master i: 196879: c9e01130faad61741f4ce6bc9fc36115e68929be v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a44469a9282..39d2f892ee35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4604d6366859f781ad16c07a6c65b16fc96e26c5 +refs/heads/master: fc8ce1941d668c70e57a07f13f5a63e73e5dbff3 diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index 91085c1ab52f..15c96207e626 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/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);