projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[linux-2.6-block.git]
/
block
/
bio.c
diff --git
a/block/bio.c
b/block/bio.c
index 4f184d938942dcbbbbedbac3b330f6e4bb39a4a9..dbabd48b1934739bba125827e2019414cf34adee 100644
(file)
--- a/
block/bio.c
+++ b/
block/bio.c
@@
-1125,7
+1125,7
@@
struct bio *bio_copy_user_iov(struct request_queue *q,
int i, ret;
int nr_pages = 0;
unsigned int len = iter->count;
int i, ret;
int nr_pages = 0;
unsigned int len = iter->count;
- unsigned int offset = map_data ?
map_data->offset & ~PAGE_MASK
: 0;
+ unsigned int offset = map_data ?
offset_in_page(map_data->offset)
: 0;
for (i = 0; i < iter->nr_segs; i++) {
unsigned long uaddr;
for (i = 0; i < iter->nr_segs; i++) {
unsigned long uaddr;
@@
-1304,7
+1304,7
@@
struct bio *bio_map_user_iov(struct request_queue *q,
goto out_unmap;
}
goto out_unmap;
}
- offset =
uaddr & ~PAGE_MASK
;
+ offset =
offset_in_page(uaddr)
;
for (j = cur_page; j < page_limit; j++) {
unsigned int bytes = PAGE_SIZE - offset;
for (j = cur_page; j < page_limit; j++) {
unsigned int bytes = PAGE_SIZE - offset;