From: Arnd Bergmann Date: Mon, 27 Feb 2017 22:26:44 +0000 (-0800) Subject: mm,fs,dax: mark dax_iomap_pmd_fault as const X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=01cddfe99008da87dd4f6b8fbfa31e09257b9133;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mm,fs,dax: mark dax_iomap_pmd_fault as const The two alternative implementations of dax_iomap_fault have different prototypes, and one of them is obviously wrong as seen from this build warning: fs/dax.c: In function 'dax_iomap_fault': fs/dax.c:1462:35: error: passing argument 2 of 'dax_iomap_pmd_fault' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] This marks the argument 'const' as in all the related functions. Fixes: a2d581675d48 ("mm,fs,dax: change ->pmd_fault to ->huge_fault") Link: http://lkml.kernel.org/r/20170227203349.3318733-1-arnd@arndb.de Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/dax.c b/fs/dax.c index 5ae8b71ebadc..7436c98b92c8 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1436,7 +1436,8 @@ out: return result; } #else -static int dax_iomap_pmd_fault(struct vm_fault *vmf, struct iomap_ops *ops) +static int dax_iomap_pmd_fault(struct vm_fault *vmf, + const struct iomap_ops *ops) { return VM_FAULT_FALLBACK; }