Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: remove the BIO_USER_MAPPED flag

Browse Source 
Just check if there is private data, in which case the bio must have
originated from bio_copy_user_iov.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-08-27 17:37:48 +02:00 committed by Jens Axboe
parent 7589ad6729
commit 3310eebafe
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/blk-map.c
View File

@ -109,7 +109,7 @@ static int bio_uncopy_user(struct bio *bio)
struct bio_map_data *bmd = bio->bi_private; struct bio_map_data *bmd = bio->bi_private;
int ret = 0; int ret = 0;
if (!bmd || !bmd->is_null_mapped) { if (!bmd->is_null_mapped) {
/* /*
* if we're in a workqueue, the request is orphaned, so * if we're in a workqueue, the request is orphaned, so
* don't copy into a random user address space, just free * don't copy into a random user address space, just free
@ -307,8 +307,6 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
break; break;
} }
bio_set_flag(bio, BIO_USER_MAPPED);
/* /*
* Subtle: if we end up needing to bounce a bio, it would normally * Subtle: if we end up needing to bounce a bio, it would normally
* disappear when its bi_end_io is run. However, we need the original * disappear when its bi_end_io is run. However, we need the original
@ -654,12 +652,12 @@ int blk_rq_unmap_user(struct bio *bio)
if (unlikely(bio_flagged(bio, BIO_BOUNCED))) if (unlikely(bio_flagged(bio, BIO_BOUNCED)))
mapped_bio = bio->bi_private; mapped_bio = bio->bi_private;
if (bio_flagged(mapped_bio, BIO_USER_MAPPED)) { if (bio->bi_private) {
bio_unmap_user(mapped_bio);
} else {
ret2 = bio_uncopy_user(mapped_bio); ret2 = bio_uncopy_user(mapped_bio);
if (ret2 && !ret) if (ret2 && !ret)
ret = ret2; ret = ret2;
} else {
bio_unmap_user(mapped_bio);
} }
mapped_bio = bio; mapped_bio = bio;

1
include/linux/blk_types.h
View File

@ -256,7 +256,6 @@ enum {
BIO_NO_PAGE_REF, /* don't put release vec pages */ BIO_NO_PAGE_REF, /* don't put release vec pages */
BIO_CLONED, /* doesn't own data */ BIO_CLONED, /* doesn't own data */
BIO_BOUNCED, /* bio is a bounce bio */ BIO_BOUNCED, /* bio is a bounce bio */
BIO_USER_MAPPED, /* contains user pages */
BIO_WORKINGSET, /* contains userspace workingset pages */ BIO_WORKINGSET, /* contains userspace workingset pages */
BIO_QUIET, /* Make BIO Quiet */ BIO_QUIET, /* Make BIO Quiet */
BIO_CHAIN, /* chained bio, ->bi_remaining in effect */ BIO_CHAIN, /* chained bio, ->bi_remaining in effect */