From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758124AbbIDKvA (ORCPT ); Fri, 4 Sep 2015 06:51:00 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:35745 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbbIDKu6 (ORCPT ); Fri, 4 Sep 2015 06:50:58 -0400 From: Geert Uytterhoeven To: Kent Overstreet , Jens Axboe , Joern Engel , Prasad Joshi Cc: logfs@logfs.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] logfs: Use min_t() to compare different types Date: Fri, 4 Sep 2015 12:50:59 +0200 Message-Id: <1441363859-20979-1-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org fs/logfs/dev_bdev.c: In function ‘__bdev_writeseg’: fs/logfs/dev_bdev.c:84: warning: comparison of distinct pointer types lacks a cast fs/logfs/dev_bdev.c: In function ‘do_erase’: fs/logfs/dev_bdev.c:174: warning: comparison of distinct pointer types lacks a cast Until b54ffb73cadcdcff ("block: remove bio_get_nr_vecs()") there were explicit casts to "size_t" to avoid compiler warnings. Use "min_t(size_t, ...)" instead. Fixes: b54ffb73cadcdcff ("block: remove bio_get_nr_vecs()"). Signed-off-by: Geert Uytterhoeven --- The nearby code desperately needs some int/unsigned int/size_t cleanups (e.g. an "int" loop counter with a "size_t" limit?). --- fs/logfs/dev_bdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c index a7fdbd86847453ac..a709d80c8ebcc783 100644 --- a/fs/logfs/dev_bdev.c +++ b/fs/logfs/dev_bdev.c @@ -81,7 +81,7 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index, unsigned int max_pages; int i; - max_pages = min(nr_pages, BIO_MAX_PAGES); + max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); bio = bio_alloc(GFP_NOFS, max_pages); BUG_ON(!bio); @@ -171,7 +171,7 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index, unsigned int max_pages; int i; - max_pages = min(nr_pages, BIO_MAX_PAGES); + max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); bio = bio_alloc(GFP_NOFS, max_pages); BUG_ON(!bio); -- 1.9.1