md: more open-coded offset_in_page()

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

diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
index db3ae4c2b2233a4026ebe8a183042eb84d53cdc4..dde6172f3f105dde590744b52fd9116db10f825d 100644 (file)
--- a/drivers/md/bcache/util.c
+++ b/drivers/md/bcache/util.c
@@ -230,7 +230,7 @@ void bch_bio_map(struct bio *bio, void *base)
        BUG_ON(!bio->bi_iter.bi_size);
        BUG_ON(bio->bi_vcnt);
 
-       bv->bv_offset = base ? ((unsigned long) base) % PAGE_SIZE : 0;
+       bv->bv_offset = base ? offset_in_page(base) : 0;
        goto start;
 
        for (; size; bio->bi_vcnt++, bv++) {

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 81c5e1a1f36389e0d743eedfb6ae895de88340be..06d426eb5a306b79c1ef9bbac00c9a36578226fb 100644 (file)
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -246,7 +246,7 @@ static void vm_dp_init(struct dpages *dp, void *data)
 {
        dp->get_page = vm_get_page;
        dp->next_page = vm_next_page;
-       dp->context_u = ((unsigned long) data) & (PAGE_SIZE - 1);
+       dp->context_u = offset_in_page(data);
        dp->context_ptr = data;
 }
 
@@ -271,7 +271,7 @@ static void km_dp_init(struct dpages *dp, void *data)
 {
        dp->get_page = km_get_page;
        dp->next_page = km_next_page;
-       dp->context_u = ((unsigned long) data) & (PAGE_SIZE - 1);
+       dp->context_u = offset_in_page(data);
        dp->context_ptr = data;
 }