diff options
| author | Zach Brown <zab@zabbo.net> | 2012-09-20 14:33:00 -0600 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-09 09:15:39 -0400 |
| commit | 221b831835421f9451182611fa25fa60f440662f (patch) | |
| tree | 7f2420d6333849e9bd22646d2e44af9fa987bc04 /fs/btrfs/file-item.c | |
| parent | 67b0fd63d5466bb710677afd3d2b77926c55f662 (diff) | |
| download | op-kernel-dev-221b831835421f9451182611fa25fa60f440662f.zip op-kernel-dev-221b831835421f9451182611fa25fa60f440662f.tar.gz | |
btrfs: fix min csum item size warnings in 32bit
commit 7ca4be45a0255ac8f08c05491c6add2dd87dd4f8 limited csum items to
PAGE_CACHE_SIZE. It used min() with incompatible types in 32bit which
generates warnings:
fs/btrfs/file-item.c: In function ‘btrfs_csum_file_blocks’:
fs/btrfs/file-item.c:717: warning: comparison of distinct pointer types lacks a cast
This uses min_t(u32,) to fix the warnings. u32 seemed reasonable
because btrfs_root->leafsize is u32 and PAGE_CACHE_SIZE is unsigned
long.
Signed-off-by: Zach Brown <zab@zabbo.net>
Diffstat (limited to 'fs/btrfs/file-item.c')
| -rw-r--r-- | fs/btrfs/file-item.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 54f0335..1ad08e4e4 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -29,7 +29,8 @@ sizeof(struct btrfs_item) * 2) / \ size) - 1)) -#define MAX_CSUM_ITEMS(r, size) (min(__MAX_CSUM_ITEMS(r, size), PAGE_CACHE_SIZE)) +#define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \ + PAGE_CACHE_SIZE)) #define MAX_ORDERED_SUM_BYTES(r) ((PAGE_SIZE - \ sizeof(struct btrfs_ordered_sum)) / \ |
