diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 21:37:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 21:37:07 +0100 |
| commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
| tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /block/blk-map.c | |
| parent | 0bb943c7a2136716757a263f604d26309fd98042 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
| download | kernel_samsung_crespo-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.zip kernel_samsung_crespo-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.tar.gz kernel_samsung_crespo-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.tar.bz2 | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'block/blk-map.c')
| -rw-r--r-- | block/blk-map.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index 4849fa3..0f4b4b8 100644 --- a/block/blk-map.c +++ b/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; |