korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

bio_map_user_iov(): move alignment check into the main loop

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-09-23 16:23:18 -04:00
parent e2e115d18b
commit 98f0bc9905
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
block/bio.c
View File

@ -1344,11 +1344,6 @@ struct bio *bio_map_user_iov(struct request_queue *q,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
nr_pages += end - start; nr_pages += end - start;
/*
* buffer must be aligned to at least logical block size for now
*/
if (uaddr & queue_dma_alignment(q))
return ERR_PTR(-EINVAL);
} }
if (!nr_pages) if (!nr_pages)
@ -1373,29 +1368,34 @@ struct bio *bio_map_user_iov(struct request_queue *q,
npages = DIV_ROUND_UP(offs + bytes, PAGE_SIZE); npages = DIV_ROUND_UP(offs + bytes, PAGE_SIZE);
for (j = 0; j < npages; j++) { if (unlikely(offs & queue_dma_alignment(q))) {
unsigned int n = PAGE_SIZE - offs; ret = -EINVAL;
unsigned short prev_bi_vcnt = bio->bi_vcnt; j = 0;
} else {
for (j = 0; j < npages; j++) {
struct page *page = pages[j];
unsigned int n = PAGE_SIZE - offs;
unsigned short prev_bi_vcnt = bio->bi_vcnt;
if (n > bytes) if (n > bytes)
n = bytes; n = bytes;
if (!bio_add_pc_page(q, bio, pages[j], n, offs)) if (!bio_add_pc_page(q, bio, page, n, offs))
break; break;
/* /*
* check if vector was merged with previous * check if vector was merged with previous
* drop page reference if needed * drop page reference if needed
*/ */
if (bio->bi_vcnt == prev_bi_vcnt) if (bio->bi_vcnt == prev_bi_vcnt)
put_page(pages[j]); put_page(page);
added += n; added += n;
bytes -= n; bytes -= n;
offs = 0; offs = 0;
}
iov_iter_advance(&i, added);
} }
iov_iter_advance(&i, added);
/* /*
* release the pages we didn't map into the bio, if any * release the pages we didn't map into the bio, if any
*/ */