1 files changed, 10 insertions, 3 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 427c36b430a6..6276add8538a 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1373,7 +1373,8 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
 
         if (tm->op == MOD_LOG_KEY_REMOVE_WHILE_FREEING) {
                 BUG_ON(tm->slot != 0);
-                eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start);
+                eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start,
+                                                eb->len);
                 if (!eb_rewin) {
                         btrfs_tree_read_unlock_blocking(eb);
                         free_extent_buffer(eb);
@@ -1454,7 +1455,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
         } else if (old_root) {
                 btrfs_tree_read_unlock(eb_root);
                 free_extent_buffer(eb_root);
-                eb = alloc_dummy_extent_buffer(root->fs_info, logical);
+                eb = alloc_dummy_extent_buffer(root->fs_info, logical,
+                                        root->nodesize);
         } else {
                 btrfs_set_lock_blocking_rw(eb_root, BTRFS_READ_LOCK);
                 eb = btrfs_clone_extent_buffer(eb_root);
@@ -1552,6 +1554,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
                        trans->transid, root->fs_info->generation);
 
         if (!should_cow_block(trans, root, buf)) {
+                trans->dirty = true;
                 *cow_ret = buf;
                 return 0;
         }
@@ -2510,6 +2513,8 @@ read_block_for_search(struct btrfs_trans_handle *trans,
                 if (!btrfs_buffer_uptodate(tmp, 0, 0))
                         ret = -EIO;
                 free_extent_buffer(tmp);
+        } else {
+                ret = PTR_ERR(tmp);
         }
         return ret;
 }
@@ -2773,8 +2778,10 @@ again:
                          * then we don't want to set the path blocking,
                          * so we test it here
                          */
-                        if (!should_cow_block(trans, root, b))
+                        if (!should_cow_block(trans, root, b)) {
+                                trans->dirty = true;
                                 goto cow_done;
+                        }
 
                         /*
                          * must have write locks on this node and the