From 5fe0cd7d45cd96006eaf95f034fe7adfdcddd71b Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri, 8 Jun 2012 16:39:24 +0200
Subject: [PATCH] --- yaml --- r: 346204 b: refs/heads/master c:
 629663c94242cfcff45abed61a019304ab85420c h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/block/drbd/drbd_req.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 03277a05c05e..37a2bc2c1d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab53b90e89eb2421a607655cab426232fdd82f6f
+refs/heads/master: 629663c94242cfcff45abed61a019304ab85420c
diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c
index d0d516743fb1..a3617f338269 100644
--- a/trunk/drivers/block/drbd/drbd_req.c
+++ b/trunk/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);