Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / fs / logfs / dev_bdev.c

diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c
index a7fdbd86847453ac524b261351894ef1c275fe0a..a709d80c8ebcc783fe21b34b8f77424edb0b94ea 100644 (file)
--- 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);