On Sat, Dec 14, 2013 at 10:25:24PM +0100, Helge Deller wrote:
> Dear stable-kernel team,
> can you please apply this patch to kernel 3.2 and higher.
> Thanks,
> Helge
>
> upstream commit 3873d064b8538686bbbd4b858dc8a07db1f7f43a
>
Thanks, I'm queuing it for the 3.5 and 3.11 kernels.
Cheers,
--
Luis
>
> nfs: fix do_div() warning by instead using sector_div()
>
> When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
> shown below. Fix this warning by instead using sector_div() which is provided
> by the kernel.h header file.
>
> fs/nfs/blocklayout/extents.c: In function ‘normalize’:
> include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
> nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
> fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
> include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
> extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
>
> Signed-off-by: Helge Deller <deller@xxxxxx>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
>
> diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c
> index 9c3e117..4d01614 100644
> --- a/fs/nfs/blocklayout/extents.c
> +++ b/fs/nfs/blocklayout/extents.c
> @@ -44,7 +44,7 @@
> static inline sector_t normalize(sector_t s, int base)
> {
> sector_t tmp = s; /* Since do_div modifies its argument */
> - return s - do_div(tmp, base);
> + return s - sector_div(tmp, base);
> }
>
> static inline sector_t normalize_up(sector_t s, int base)
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html