diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-01 12:32:37 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-01 12:32:37 -0700 |
| commit | d2c36dad5c0515f2dcfe24c7613fe241562138c8 (patch) | |
| tree | bc21753ff15f1fa3cd1c371d63c8ae11506f405c /block | |
| parent | 4a8ef4ed50f915d2ca48e15f429fe26d5e0774af (diff) | |
| parent | 5fad1b64aed8bd63ca7da2ba92107ba9ecd9a2c8 (diff) | |
Merge branch 'for-4.11/block' into for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/bio.c b/block/bio.c index 9a2dd7145e83..4b564d0c3e29 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1394,7 +1394,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, bio_set_flag(bio, BIO_USER_MAPPED); /* - * subtle -- if __bio_map_user() ended up bouncing a bio, + * subtle -- if bio_map_user_iov() ended up bouncing a bio, * it would normally disappear when its bi_end_io is run. * however, we need it for the unmap, so grab an extra * reference to it @@ -1436,8 +1436,8 @@ static void __bio_unmap_user(struct bio *bio) * bio_unmap_user - unmap a bio * @bio: the bio being unmapped * - * Unmap a bio previously mapped by bio_map_user(). Must be called with - * a process context. + * Unmap a bio previously mapped by bio_map_user_iov(). Must be called from + * process context. * * bio_unmap_user() may sleep. */ |