diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 17:04:14 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 17:04:14 -0500 |
| commit | 7dadfac23d4ea0fd70fb3daffb44aa8d85dc7d30 (patch) | |
| tree | 52edfe7ff36975db8822e469ea65eabdd5911c66 /block | |
| parent | 3ccf9f0b3a74f40c0fba1cc3ad588be4241fb4e6 (diff) | |
| parent | e1fe3813117f465a2db200aebb13969056986c64 (diff) | |
Merge tag 'v4.4.93' into v4.4-rt
This is the 4.4.93 stable release
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; } |