Commit bd5cecea authored by Geliang Tang's avatar Geliang Tang Committed by Jens Axboe
Browse files

bio: use offset_in_page macro 



Use offset_in_page macro instead of (addr & ~PAGE_MASK).

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 1fe8f348

block/bio.c

+2 −2
Original line number Diff line number Diff line
@@ -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;