summaryrefslogtreecommitdiff
path: root/fs/btrfs/zlib.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-11-11 09:34:41 -0500
committerChris Mason <chris.mason@oracle.com>2008-11-11 09:34:41 -0500
commit5b050f04c8ce911c5b6831305a24d70eab95e732 (patch)
treeebc7be1f9526a75a8d7ac7a7984c20d728ca96d1 /fs/btrfs/zlib.c
parent8247b41ac980d125de8aeba6f33f381056ac0ecb (diff)
downloadlinux-3.10-5b050f04c8ce911c5b6831305a24d70eab95e732.tar.gz
linux-3.10-5b050f04c8ce911c5b6831305a24d70eab95e732.tar.bz2
linux-3.10-5b050f04c8ce911c5b6831305a24d70eab95e732.zip
Btrfs: Fix compile warnings on 32 bit machines
Simple casting here and there to fix things up. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/zlib.c')
-rw-r--r--fs/btrfs/zlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index ba2527d0873..5b9f7002513 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;