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>

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d0d516743fb1d8c2a3fe3173169565921df3b0cb..a3617f338269d902857eb0fba50e4a0dc5597ade 100644 (file)
--- 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);