... and a couple in net/9p

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 9fc6a56c506aaa4ea7373dc37a8a9f899387a965..199bc76202d2552d23fe964f377bbf69eaf518b9 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -105,7 +105,7 @@ static struct list_head virtio_chan_list;
 /* How many bytes left in this page. */
 static unsigned int rest_of_page(void *data)
 {
-       return PAGE_SIZE - ((unsigned long)data % PAGE_SIZE);
+       return PAGE_SIZE - offset_in_page(data);
 }
 
 /**
@@ -365,7 +365,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
                        return -ENOMEM;
 
                *need_drop = 0;
-               p -= (*offs = (unsigned long)p % PAGE_SIZE);
+               p -= (*offs = offset_in_page(p));
                for (index = 0; index < nr_pages; index++) {
                        if (is_vmalloc_addr(p))
                                (*pages)[index] = vmalloc_to_page(p);