Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

logfs: fix build warning

fs/logfs/dev_bdev.c: In function '__bdev_writeseg':
include/linux/kernel.h:601:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&_min1 == &_min2); \
fs/logfs/dev_bdev.c:84:14: note: in expansion of macro 'min'
max_pages = min(nr_pages, BIO_MAX_PAGES);

fs/logfs/dev_bdev.c: In function 'do_erase':
include/linux/kernel.h:601:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&_min1 == &_min2); \
fs/logfs/dev_bdev.c:174:14: note: in expansion of macro 'min'
max_pages = min(nr_pages, BIO_MAX_PAGES);

Lets use min_t and mention the type.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Cc: Joern Engel <joern@logfs.org>
Cc: Prasad Joshi <prasadjoshi.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Sudip Mukherjee and committed by
Linus Torvalds
ce4f2fd7 d30e2c05

+2 -2
+2 -2
fs/logfs/dev_bdev.c
··· 81 81 unsigned int max_pages; 82 82 int i; 83 83 84 - max_pages = min(nr_pages, BIO_MAX_PAGES); 84 + max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); 85 85 86 86 bio = bio_alloc(GFP_NOFS, max_pages); 87 87 BUG_ON(!bio); ··· 171 171 unsigned int max_pages; 172 172 int i; 173 173 174 - max_pages = min(nr_pages, BIO_MAX_PAGES); 174 + max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); 175 175 176 176 bio = bio_alloc(GFP_NOFS, max_pages); 177 177 BUG_ON(!bio);