aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-06-08 16:39:24 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:58:33 +0100
commit629663c94242cfcff45abed61a019304ab85420c (patch)
treed5ec1aab6a2cd8a7d77fb6e13d07982cc34e0492 /drivers/block/drbd/drbd_req.c
parentab53b90e89eb2421a607655cab426232fdd82f6f (diff)
downloadvexpress-lsk-629663c94242cfcff45abed61a019304ab85420c.tar.gz
drbd: fix wrong assert in completion/retry path of failed local reads
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d0d516743fb..a3617f33826 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);