---

yaml --- r: 119167 b: refs/heads/master c: c26156b h: refs/heads/master i: 119165: 9adce27 119163: 42cb267 119159: bc7e6a4 119151: 4a0fbd6 119135: 8fc27e0 119103: 73025b8 119039: 45ddee2 v: v3
git-mirror · Nov 18, 2008 · c1abd82 · c1abd82
1 parent b858890
commit c1abd82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ba4031ab2adc8b394295e68aa4c8fe9d5060db
+refs/heads/master: c26156b2534c75bb3cdedf76f6ad1340971cf5bd
diff --git a/trunk/block/blk-map.c b/trunk/block/blk-map.c
@@ -217,6 +217,12 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 		return PTR_ERR(bio);
 
 	if (bio->bi_size != len) {
+		/*
+		 * Grab an extra reference to this bio, as bio_unmap_user()
+		 * expects to be able to drop it twice as it happens on the
+		 * normal IO completion path
+		 */
+		bio_get(bio);
 		bio_endio(bio, 0);
 		bio_unmap_user(bio);
 		return -EINVAL;