diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 4 |
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, | |||
184 | int i = 0; | 184 | int i = 0; |
185 | while(compressed_size > 0) { | 185 | while(compressed_size > 0) { |
186 | cpage = compressed_pages[i]; | 186 | cpage = compressed_pages[i]; |
187 | cur_size = min(compressed_size, | 187 | cur_size = min_t(unsigned long, compressed_size, |
188 | PAGE_CACHE_SIZE); | 188 | PAGE_CACHE_SIZE); |
189 | 189 | ||
190 | kaddr = kmap(cpage); | 190 | kaddr = kmap(cpage); |
@@ -3812,7 +3812,7 @@ static noinline int uncompress_inline(struct btrfs_path *path, | |||
3812 | 3812 | ||
3813 | read_extent_buffer(leaf, tmp, ptr, inline_size); | 3813 | read_extent_buffer(leaf, tmp, ptr, inline_size); |
3814 | 3814 | ||
3815 | max_size = min(PAGE_CACHE_SIZE, max_size); | 3815 | max_size = min_t(unsigned long, PAGE_CACHE_SIZE, max_size); |
3816 | ret = btrfs_zlib_decompress(tmp, page, extent_offset, | 3816 | ret = btrfs_zlib_decompress(tmp, page, extent_offset, |
3817 | inline_size, max_size); | 3817 | inline_size, max_size); |
3818 | if (ret) { | 3818 | if (ret) { |