---

yaml --- r: 309340 b: refs/heads/master c: 41c4a00 h: refs/heads/master v: v3
git-mirror · May 9, 2012 · e3ac7b5 · e3ac7b5
1 parent 43d0802
commit e3ac7b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d49e101fd3d3dbd525564923a82fb8a66676420
+refs/heads/master: 41c4a0035b36d400b79cbd945390a76e909711a7
diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c
@@ -569,6 +569,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
 		drbd_queue_work(&mdev->data.work, &req->w);
 		break;
 
+	case read_retry_remote_canceled:
 	case send_canceled:
 	case send_failed:
 		/* real cleanup will be done from tl_clear.  just update flags
@@ -610,9 +611,6 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
 		_req_may_be_done_not_susp(req, m);
 		break;
 
-	case read_retry_remote_canceled:
-		req->rq_state &= ~RQ_NET_QUEUED;
-		/* fall through, in case we raced with drbd_disconnect */
 	case connection_lost_while_pending:
 		/* transfer log cleanup after connection loss */
 		/* assert something? */