diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-19 14:23:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-19 14:23:10 +0800 |
| commit | ce6cd7bc4af7e1c83b8a87cb1f4639b7fd75dc15 (patch) | |
| tree | b443e7106f17902f6c54f01ae4c889b4a2c7add5 /block | |
| parent | e8c57f8c6db404257443709ed1949de254b9874f (diff) | |
| parent | 218dea0148db38d8d4d30d2eebbaa39b49fa4275 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c index 14263fab94d3..68bbc835bacc 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1320,6 +1320,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, offset = uaddr & ~PAGE_MASK; for (j = cur_page; j < page_limit; j++) { unsigned int bytes = PAGE_SIZE - offset; + unsigned short prev_bi_vcnt = bio->bi_vcnt; if (len <= 0) break; @@ -1334,6 +1335,13 @@ struct bio *bio_map_user_iov(struct request_queue *q, bytes) break; + /* + * check if vector was merged with previous + * drop page reference if needed + */ + if (bio->bi_vcnt == prev_bi_vcnt) + put_page(pages[j]); + len -= bytes; offset = 0; } |