From 43669ddbf313e64bcd72ebed66dc7f743c010c17 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 29 Aug 2012 15:23:14 +0200 Subject: [PATCH] --- yaml --- r: 346260 b: refs/heads/master c: 76590cd1fc338fd1c50f7121636db421deb8b881 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 98886258fc23..52f33c9aa418 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19fffd7b0303e8843aa2decfd43fa57c9d511409 +refs/heads/master: 76590cd1fc338fd1c50f7121636db421deb8b881 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 57cbef2ecee1..d1d17fcd9232 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -141,10 +141,9 @@ void drbd_req_destroy(struct kref *kref) * but after the extent has been dropped from the al, * we would forget to resync the corresponding extent. */ - if (s & RQ_LOCAL_MASK) { + if (s & RQ_IN_ACT_LOG) { if (get_ldev_if_state(mdev, D_FAILED)) { - if (s & RQ_IN_ACT_LOG) - drbd_al_complete_io(mdev, &req->i); + drbd_al_complete_io(mdev, &req->i); put_ldev(mdev); } else if (__ratelimit(&drbd_ratelimit_state)) { dev_warn(DEV, "Should have called drbd_al_complete_io(, %llu, %u), "