Merge branch 'kdave-v4.8' into for-linus-4.8

1 files changed, 4 insertions, 5 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 62a81ee13a5f..2fc803da4680 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -27,9 +27,8 @@
 #include "print-tree.h"
 #include "compression.h"
 
-#define __MAX_CSUM_ITEMS(r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \
-                                   sizeof(struct btrfs_item) * 2) / \
-                                  size) - 1))
+#define __MAX_CSUM_ITEMS(r, size) \
+        ((unsigned long)(((BTRFS_MAX_ITEM_SIZE(r) * 2) / size) - 1))
 
 #define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \
                                        PAGE_SIZE))
@@ -250,7 +249,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                                 offset + root->sectorsize - 1,
                                                 EXTENT_NODATASUM);
                                 } else {
-                                        btrfs_info(BTRFS_I(inode)->root->fs_info,
+                                        btrfs_info_rl(BTRFS_I(inode)->root->fs_info,
                                                    "no csum found for inode %llu start %llu",
                                                btrfs_ino(inode), offset);
                                 }
@@ -699,7 +698,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                          */
                         ret = btrfs_split_item(trans, root, path, &key, offset);
                         if (ret && ret != -EAGAIN) {
-                                btrfs_abort_transaction(trans, root, ret);
+                                btrfs_abort_transaction(trans, ret);
                                 goto out;
                         }