From 1ace13598516616a449fe50e82692789cc5b6b78 Mon Sep 17 00:00:00 2001
From: Zach Brown <zab@zabbo.net>
Date: Thu, 20 Sep 2012 14:33:00 -0600
Subject: [PATCH] --- yaml --- r: 332593 b: refs/heads/master c:
 221b831835421f9451182611fa25fa60f440662f h: refs/heads/master i:   332591:
 dd4cb48fd68b42fe685fe3e59ad54abf24c5e31b v: v3

---
 [refs]                     | 2 +-
 trunk/fs/btrfs/file-item.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f7e4b44d5a2f..09a72f9fdbd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67b0fd63d5466bb710677afd3d2b77926c55f662
+refs/heads/master: 221b831835421f9451182611fa25fa60f440662f
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
index 54f03354bed1..1ad08e4e4a15 100644
--- a/trunk/fs/btrfs/file-item.c
+++ b/trunk/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)) / \