From 629663c94242cfcff45abed61a019304ab85420c Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Fri, 8 Jun 2012 16:39:24 +0200 Subject: [PATCH] drbd: fix wrong assert in completion/retry path of failed local reads Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_req.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index d0d5167..a3617f33 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -349,7 +349,7 @@ void req_may_be_completed(struct drbd_request *req, struct bio_and_error *m) * what about (RQ_LOCAL_PENDING | RQ_LOCAL_ABORTED)? */ D_ASSERT(!(s & RQ_LOCAL_PENDING)); - D_ASSERT(s & RQ_NET_DONE); + D_ASSERT((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)); } } req_may_be_done(req); -- 2.7.4