Commit 42049bf6 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: fix __MAX_CSUM_ITEMS 



Jeff Mahoney's cleanup commit (14a1e067) wasn't correct for csums on
machines where the pagesize >= metadata blocksize.

This just reverts the relevant hunks to bring the old math back.

Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 023a824f

fs/btrfs/file-item.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,9 @@ 
#include "print-tree.h"

#include "print-tree.h"

#include "compression.h"

#include "compression.h"





#define __MAX_CSUM_ITEMS(r, size) \

#define __MAX_CSUM_ITEMS(r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \

	((unsigned long)(((BTRFS_MAX_ITEM_SIZE(r) * 2) / size) - 1))

				   sizeof(struct btrfs_item) * 2) / \

				  size) - 1))





#define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \

#define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \

				       PAGE_SIZE))

				       PAGE_SIZE))