---

yaml --- r: 332593 b: refs/heads/master c: 221b831 h: refs/heads/master i: 332591: dd4cb48 v: v3
git-mirror · Oct 9, 2012 · 1ace135 · 1ace135
1 parent 1c74f42
commit 1ace135
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)) / \