The dm verity sec implementation uses do_div for dividing a sector_t, which is slower than necessary when sector_t is a 32-bit type, and we now get a warning for this case: include/asm-generic/div64.h:224:22: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types] drivers/md/dm-verity-fec.c:725:6: note: in expansion of macro 'do_div' if (do_div(f->rounds, f->rsn)) This changes the code to use sector_div instead, which does the right thing and avoids the warning. Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> --- drivers/md/dm-verity-fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I believe we had a fix for this in the series that introduced the optimized do_div, but the file got moved around and the fix got lost. diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index e722ce57520f..1bddaca37e98 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -722,7 +722,7 @@ int verity_fec_ctr(struct dm_verity *v) } f->rounds = f->blocks; - if (do_div(f->rounds, f->rsn)) + if (sector_div(f->rounds, f->rsn)) f->rounds++; /* -- 2.1.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
