x86/mm/pkeys: Actually enable Memory Protection Keys in the CPU

[cascardo/linux.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 4f184d9..dbabd48 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;
-       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;
@@ -1304,7 +1304,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
                        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;