From 68954f00bcaa4a7b9b193ff659719ae713c35f69 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 31 Jan 2012 20:19:02 -0500 Subject: [PATCH] --- yaml --- r: 297909 b: refs/heads/master c: 7ca4be45a0255ac8f08c05491c6add2dd87dd4f8 h: refs/heads/master i: 297907: 0b0f58c7ac48fa73eeb97b26c7a8e58dee6bbcf7 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/file-item.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25a4810669a5..9ae0a81c2801 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c4bb26b213e618473e486776483a5bad15ba6da +refs/heads/master: 7ca4be45a0255ac8f08c05491c6add2dd87dd4f8 diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c index a14dbca5974e..cab0ffb5ef3b 100644 --- a/trunk/fs/btrfs/file-item.c +++ b/trunk/fs/btrfs/file-item.c @@ -25,10 +25,12 @@ #include "transaction.h" #include "print-tree.h" -#define MAX_CSUM_ITEMS(r, size) ((((BTRFS_LEAF_DATA_SIZE(r) - \ +#define __MAX_CSUM_ITEMS(r, size) ((((BTRFS_LEAF_DATA_SIZE(r) - \ sizeof(struct btrfs_item) * 2) / \ size) - 1)) +#define MAX_CSUM_ITEMS(r, size) (min(__MAX_CSUM_ITEMS(r, size), PAGE_CACHE_SIZE)) + #define MAX_ORDERED_SUM_BYTES(r) ((PAGE_SIZE - \ sizeof(struct btrfs_ordered_sum)) / \ sizeof(struct btrfs_sector_sum) * \