Skip to content

Commit

Permalink
nfs: fix do_div() warning by instead using sector_div()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
  • Loading branch information
hdeller authored and Trond Myklebust committed Dec 4, 2013
1 parent cd7b996 commit 3873d06
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfs/blocklayout/extents.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3873d06

Please sign in to comment.