---

yaml --- r: 346204 b: refs/heads/master c: 629663c h: refs/heads/master v: v3
git-mirror · Nov 8, 2012 · 5fe0cd7 · 5fe0cd7
1 parent a5c0b3d
commit 5fe0cd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);