X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_io.c;h=dd26c0a38fbae6c7871a055c5376e5f7c3f0a8a1;hp=ab1fc5f3e8f3c053bd1e102687f55c971fd180d2;hb=6c3f0cfb4a8e372e8c3ae612c6eee7b7715fbeb7;hpb=7d68bfb9914c4c0dadb0aee2502f35a44dd638e3

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index ab1fc5f..dd26c0a 100644
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -614,11 +614,9 @@ static inline uint64_t osd_roundup2blocksz(uint64_t size,
 	size += offset % blksz;
 
 	if (likely(is_power_of_2(blksz)))
-		return PO2_ROUNDUP_TYPED(size, blksz, uint64_t);
-
-	size += blksz - 1;
-	do_div(size, blksz);
-	return size * blksz;
+		return round_up(size, blksz);
+	else
+		return DIV_ROUND_UP_ULL(size, blksz) * blksz;
 }
 
 static int osd_declare_write_commit(const struct lu_env *env,