diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 20:53:19 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 20:53:19 +0530 |
| commit | 839f2491691c12aaf002572d5ba4558ab01aeedf (patch) | |
| tree | f7050611c7594b857ff951383e28ed3800f8fb1e /block | |
| parent | a717135c23fa60cfaf0c3768e8e72383237ce88d (diff) | |
| parent | ffd95f430f715eb4b86e158a4cff2db55e0d86f8 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts due to AOSP's backported commits:
fs/f2fs/crypto.c
fs/f2fs/crypto_fname.c
Deleted by AOSP commit c1286ff41c2f ("f2fs: backport from (4c1fad64 -
Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")
fs/f2fs/crypto_key.c
fs/f2fs/data.c
fs/f2fs/file.c
AOSP commit 13f002354db1 ("f2fs: catch up to v4.14-rc1")
override most of stable 4.4.y changes.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 8 | ||||
| -rw-r--r-- | block/bsg-lib.c | 1 |
2 files changed, 9 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; } diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 341b8d858e67..650f427d915b 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -147,6 +147,7 @@ static int bsg_create_job(struct device *dev, struct request *req) failjob_rls_rqst_payload: kfree(job->request_payload.sg_list); failjob_rls_job: + kfree(job); return -ENOMEM; } |