btrfs: 32-bit type problems

An assorted set of casts to get rid of the warnings on 32-bit archs.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index e87e476dca9..89d0ebd0ea8 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -2654,8 +2654,8 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
 
                 cur = min(len, (unsigned long)(PAGE_CACHE_SIZE -
                                                src_off_in_page));
-                cur = min(cur, (unsigned long)(PAGE_CACHE_SIZE -
-                                               dst_off_in_page));
+                cur = min_t(unsigned long, cur,
+                        (unsigned long)(PAGE_CACHE_SIZE - dst_off_in_page));
 
                 copy_pages(extent_buffer_page(dst, dst_i),
                            extent_buffer_page(dst, src_i),
@@ -2707,7 +2707,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                 if (dst_i == 0)
                         dst_off_in_page += start_offset;
 
-                cur = min(len, src_off_in_page + 1);
+                cur = min_t(unsigned long, len, src_off_in_page + 1);
                 cur = min(cur, dst_off_in_page + 1);
                 move_pages(extent_buffer_page(dst, dst_i),
                            extent_buffer_page(dst, src_i),