---

yaml --- r: 44843 b: refs/heads/master c: 48785bb h: refs/heads/master i: 44841: 1e01132 44839: 17b1774 v: v3
git-mirror · Dec 19, 2006 · 3c0a682 · 3c0a682
1 parent 072bc44
commit 3c0a682
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c9381f9425ab4d2f9f0458ae9525c18bc832f59
+refs/heads/master: 48785bb9fa39415d7553e234946442579dfcf591
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
@@ -2504,18 +2504,23 @@ EXPORT_SYMBOL(blk_rq_map_user_iov);
 int blk_rq_unmap_user(struct request *rq)
 {
 	struct bio *bio, *mapped_bio;
+	int ret = 0, ret2;
 
 	while ((bio = rq->bio)) {
 		if (bio_flagged(bio, BIO_BOUNCED))
 			mapped_bio = bio->bi_private;
 		else
 			mapped_bio = bio;
 
-		__blk_rq_unmap_user(mapped_bio);
+		ret2 = __blk_rq_unmap_user(mapped_bio);
+		if (ret2 && !ret)
+			ret = ret2;
+
 		rq->bio = bio->bi_next;
 		bio_put(bio);
 	}
-	return 0;
+
+	return ret;
 }
 
 EXPORT_SYMBOL(blk_rq_unmap_user);