summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-02-18 13:51:56 +0100
committerJens Axboe <jens.axboe@oracle.com>2008-02-19 10:04:00 +0100
commit84e9e03c55c2456799ab19f1d577e72f721fdd39 (patch)
treee268a42aa43b6dae3c4f4c8d5c4b2e24d6e2d65a /block
parentfs/block_dev.c: remove #if 0'ed code (diff)
downloadlinux-84e9e03c55c2456799ab19f1d577e72f721fdd39.tar.xz
linux-84e9e03c55c2456799ab19f1d577e72f721fdd39.zip
block: make blk_rq_map_user() clear ->bio if it unmaps it
That way the interface is symmetric, and calling blk_rq_unmap_user() on the request wont oops. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-map.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index 955d75c1a58f..bc5ce60691c3 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -143,6 +143,7 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
return 0;
unmap_rq:
blk_rq_unmap_user(bio);
+ rq->bio = NULL;
return ret;
}
EXPORT_SYMBOL(blk_rq_map_user);