42 files changed, 1212 insertions, 1243 deletions

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 8299601a3549..7699e16784d3 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -956,8 +956,7 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq,
 /*
  * add all inline backrefs for bytenr to the list
  */
-static int __add_inline_refs(struct btrfs_fs_info *fs_info,
-                             struct btrfs_path *path, u64 bytenr,
+static int __add_inline_refs(struct btrfs_path *path, u64 bytenr,
                              int *info_level, struct list_head *prefs,
                              struct ref_root *ref_tree,
                              u64 *total_refs, u64 inum)
@@ -1284,7 +1283,7 @@ again:
                  */
                 delayed_refs = &trans->transaction->delayed_refs;
                 spin_lock(&delayed_refs->lock);
-                head = btrfs_find_delayed_ref_head(trans, bytenr);
+                head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
                 if (head) {
                         if (!mutex_trylock(&head->mutex)) {
                                 atomic_inc(&head->node.refs);
@@ -1354,7 +1353,7 @@ again:
                 if (key.objectid == bytenr &&
                     (key.type == BTRFS_EXTENT_ITEM_KEY ||
                      key.type == BTRFS_METADATA_ITEM_KEY)) {
-                        ret = __add_inline_refs(fs_info, path, bytenr,
+                        ret = __add_inline_refs(path, bytenr,
                                                 &info_level, &prefs,
                                                 ref_tree, &total_refs,
                                                 inum);
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 1a8fa46ff87e..819a6d27218a 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -224,16 +224,16 @@ static inline void btrfs_insert_inode_hash(struct inode *inode)
         __insert_inode_hash(inode, h);
 }
 
-static inline u64 btrfs_ino(struct inode *inode)
+static inline u64 btrfs_ino(struct btrfs_inode *inode)
 {
-        u64 ino = BTRFS_I(inode)->location.objectid;
+        u64 ino = inode->location.objectid;
 
         /*
          * !ino: btree_inode
          * type == BTRFS_ROOT_ITEM_KEY: subvol dir
          */
-        if (!ino || BTRFS_I(inode)->location.type == BTRFS_ROOT_ITEM_KEY)
-                ino = inode->i_ino;
+        if (!ino || inode->location.type == BTRFS_ROOT_ITEM_KEY)
+                ino = inode->vfs_inode.i_ino;
         return ino;
 }
 
@@ -248,23 +248,21 @@ static inline bool btrfs_is_free_space_inode(struct inode *inode)
         struct btrfs_root *root = BTRFS_I(inode)->root;
 
         if (root == root->fs_info->tree_root &&
-            btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID)
+            btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID)
                 return true;
         if (BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID)
                 return true;
         return false;
 }
 
-static inline int btrfs_inode_in_log(struct inode *inode, u64 generation)
+static inline int btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation)
 {
         int ret = 0;
 
-        spin_lock(&BTRFS_I(inode)->lock);
-        if (BTRFS_I(inode)->logged_trans == generation &&
-            BTRFS_I(inode)->last_sub_trans <=
-            BTRFS_I(inode)->last_log_commit &&
-            BTRFS_I(inode)->last_sub_trans <=
-            BTRFS_I(inode)->root->last_log_commit) {
+        spin_lock(&inode->lock);
+        if (inode->logged_trans == generation &&
+            inode->last_sub_trans <= inode->last_log_commit &&
+            inode->last_sub_trans <= inode->root->last_log_commit) {
                 /*
                  * After a ranged fsync we might have left some extent maps
                  * (that fall outside the fsync's range). So return false
@@ -272,10 +270,10 @@ static inline int btrfs_inode_in_log(struct inode *inode, u64 generation)
                  * will be called and process those extent maps.
                  */
                 smp_mb();
-                if (list_empty(&BTRFS_I(inode)->extent_tree.modified_extents))
+                if (list_empty(&inode->extent_tree.modified_extents))
                         ret = 1;
         }
-        spin_unlock(&BTRFS_I(inode)->lock);
+        spin_unlock(&inode->lock);
         return ret;
 }
 
@@ -326,6 +324,24 @@ static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode)
                   &BTRFS_I(inode)->runtime_flags);
 }
 
+static inline void btrfs_print_data_csum_error(struct inode *inode,
+                u64 logical_start, u32 csum, u32 csum_expected, int mirror_num)
+{
+        struct btrfs_root *root = BTRFS_I(inode)->root;
+
+        /* Output minus objectid, which is more meaningful */
+        if (root->objectid >= BTRFS_LAST_FREE_OBJECTID)
+                btrfs_warn_rl(root->fs_info,
+        "csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x mirror %d",
+                        root->objectid, btrfs_ino(BTRFS_I(inode)),
+                        logical_start, csum, csum_expected, mirror_num);
+        else
+                btrfs_warn_rl(root->fs_info,
+        "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d",
+                        root->objectid, btrfs_ino(BTRFS_I(inode)),
+                        logical_start, csum, csum_expected, mirror_num);
+}
+
 bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end);
 
 #endif
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index c4444d6f439f..903c32c9eb22 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -124,10 +124,8 @@ static int check_compressed_csum(struct inode *inode,
                 kunmap_atomic(kaddr);