drbd: fix wrong assert in completion/retry path of failed local reads
authorLars Ellenberg <lars.ellenberg@linbit.com>
Fri, 8 Jun 2012 14:39:24 +0000 (16:39 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:33 +0000 (16:58 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_req.c

index d0d5167..a3617f3 100644 (file)
@@ -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);