summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_map.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-10-19 09:22:59 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:57 -0400
commitae2f5411c4ce7180cca8418853db50c8e52d40db (patch)
treef169f0dfa6a13781dbf27baa4e283a0cc509e07d /fs/btrfs/extent_map.c
parent44b36eb20bb60d7da1375c1fb45784740a4dc358 (diff)
downloadop-kernel-dev-ae2f5411c4ce7180cca8418853db50c8e52d40db.zip
op-kernel-dev-ae2f5411c4ce7180cca8418853db50c8e52d40db.tar.gz
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>
Diffstat (limited to 'fs/btrfs/extent_map.c')
-rw-r--r--fs/btrfs/extent_map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index e87e476..89d0ebd 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),
OpenPOWER on IntegriCloud