---

yaml --- r: 146942 b: refs/heads/master c: 924cec7 h: refs/heads/master v: v3
git-mirror · Apr 28, 2009 · 28ad9da · 28ad9da
1 parent e3c3ec9
commit 28ad9da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e686307fdc84f249490e6c9da92fcb2424491f14
+refs/heads/master: 924cec7789f65ab7f022256f6533ecba0747b5f3
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1741,10 +1741,14 @@ static int __end_that_request_first(struct request *req, int error,
 	trace_block_rq_complete(req->q, req);
 
 	/*
-	 * for a REQ_TYPE_BLOCK_PC request, we want to carry any eventual
-	 * sense key with us all the way through
+	 * For fs requests, rq is just carrier of independent bio's
+	 * and each partial completion should be handled separately.
+	 * Reset per-request error on each partial completion.
+	 *
+	 * TODO: tj: This is too subtle.  It would be better to let
+	 * low level drivers do what they see fit.
 	 */
-	if (!blk_pc_request(req))
+	if (blk_fs_request(req))
 		req->errors = 0;
 
 	if (error && (blk_fs_request(req) && !(req->cmd_flags & REQ_QUIET))) {