summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.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/inode.c
parent8247b41ac980d125de8aeba6f33f381056ac0ecb (diff)
downloadtalos-op-linux-5b050f04c8ce911c5b6831305a24d70eab95e732.tar.gz
talos-op-linux-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/inode.c')
-rw-r--r--fs/btrfs/inode.c4
1 files changed, 2 insertions, 2 deletions
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) {
OpenPOWER on IntegriCloud