summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-10-21 17:21:19 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-22 15:55:22 +0200
commit8825f7c3e5c7b251b49fc594658a96f59417ee16 (patch)
tree051e2d3c2c05e89c573297feeae315e541dc30d8 /drivers/block
parentfb2c7a10eec051317ff091b2cb2d73c5ecd98c19 (diff)
downloadlinux-8825f7c3e5c7b251b49fc594658a96f59417ee16.tar.gz
linux-8825f7c3e5c7b251b49fc594658a96f59417ee16.tar.bz2
linux-8825f7c3e5c7b251b49fc594658a96f59417ee16.zip
drbd: Silenced an assert
That assertion's condition needed adjustment for today's semantics Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-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 31d04b17c45f..5c2254853559 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -258,7 +258,7 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
if (!hlist_unhashed(&req->colision))
hlist_del(&req->colision);
else
- D_ASSERT((s & RQ_NET_MASK) == 0);
+ D_ASSERT((s & (RQ_NET_MASK & ~RQ_NET_DONE)) == 0);
/* for writes we need to do some extra housekeeping */
if (rw == WRITE)