4 files changed, 12 insertions, 8 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index b582c6fd80f2..bfd1512cce0a 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -174,7 +174,8 @@ static noinline int end_compressed_writeback(struct inode *inode, u64 start,
 
         while(nr_pages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
-                                     min(nr_pages, ARRAY_SIZE(pages)), pages);
+                                     min_t(unsigned long,
+                                     nr_pages, ARRAY_SIZE(pages)), pages);
                 if (ret == 0) {
                         nr_pages -= 1;
                         index += 1;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5cc0082379ce..54d013c3bb88 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1157,7 +1157,8 @@ static noinline int __unlock_for_delalloc(struct inode *inode,
 
         while(nr_pages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
-                                     min(nr_pages, ARRAY_SIZE(pages)), pages);
+                                     min_t(unsigned long, nr_pages,
+                                     ARRAY_SIZE(pages)), pages);
                 for (i = 0; i < ret; i++) {
                         if (pages[i] != locked_page)
                                 unlock_page(pages[i]);
@@ -1192,7 +1193,8 @@ static noinline int lock_delalloc_pages(struct inode *inode,
         nrpages = end_index - index + 1;
         while(nrpages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
-                                     min(nrpages, ARRAY_SIZE(pages)), pages);
+                                     min_t(unsigned long,
+                                     nrpages, ARRAY_SIZE(pages)), pages);
                 if (ret == 0) {
                         ret = -EAGAIN;
                         goto done;
@@ -1346,7 +1348,8 @@ int extent_clear_unlock_delalloc(struct inode *inode,
 
         while(nr_pages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
-                                     min(nr_pages, ARRAY_SIZE(pages)), pages);
+                                     min_t(unsigned long,
+                                     nr_pages, ARRAY_SIZE(pages)), pages);
                 for (i = 0; i < ret; i++) {
                         if (pages[i] == locked_page) {
                                 page_cache_release(pages[i]);
@@ -1896,7 +1899,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
         int contig = 0;
         int this_compressed = bio_flags & EXTENT_BIO_COMPRESSED;
         int old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED;
-        size_t page_size = min(size, PAGE_CACHE_SIZE);
+        size_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE);
 
         if (bio_ret && *bio_ret) {
                 bio = *bio_ret;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5ca9c0672374..2ed2deacde90 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -184,7 +184,7 @@ static int noinline insert_inline_extent(struct btrfs_trans_handle *trans,
                 int i = 0;
                 while(compressed_size > 0) {
                         cpage = compressed_pages[i];
-                        cur_size = min(compressed_size,
+                        cur_size = min_t(unsigned long, compressed_size,
                                        PAGE_CACHE_SIZE);
 
                         kaddr = kmap(cpage);
@@ -3812,7 +3812,7 @@ static noinline int uncompress_inline(struct btrfs_path *path,
 
         read_extent_buffer(leaf, tmp, ptr, inline_size);
 
-        max_size = min(PAGE_CACHE_SIZE, max_size);
+        max_size = min_t(unsigned long, PAGE_CACHE_SIZE, max_size);
         ret = btrfs_zlib_decompress(tmp, page, extent_offset,
                                     inline_size, max_size);
         if (ret) {
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index ba2527d08734..5b9f7002513c 100644
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -370,7 +370,7 @@ int btrfs_zlib_decompress_biovec(struct page **pages_in,
 
         data_in = kmap(pages_in[page_in_index]);
         workspace->inf_strm.next_in = data_in;
-        workspace->inf_strm.avail_in = min(srclen, PAGE_CACHE_SIZE);
+        workspace->inf_strm.avail_in = min_t(size_t, srclen, PAGE_CACHE_SIZE);
         workspace->inf_strm.total_in = 0;
 
         workspace->inf_strm.total_out = 0;