3 files changed, 12 insertions, 1 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index e2f16b68fcbf..51b5e2da708c 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3142,7 +3142,11 @@ static noinline int check_delayed_ref(struct btrfs_root *root,
         struct rb_node *node;
         int ret = 0;
 
+        spin_lock(&root->fs_info->trans_lock);
         cur_trans = root->fs_info->running_transaction;
+        if (cur_trans)
+                refcount_inc(&cur_trans->use_count);
+        spin_unlock(&root->fs_info->trans_lock);
         if (!cur_trans)
                 return 0;
 
@@ -3151,6 +3155,7 @@ static noinline int check_delayed_ref(struct btrfs_root *root,
         head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
         if (!head) {
                 spin_unlock(&delayed_refs->lock);
+                btrfs_put_transaction(cur_trans);
                 return 0;
         }
 
@@ -3167,6 +3172,7 @@ static noinline int check_delayed_ref(struct btrfs_root *root,
                 mutex_lock(&head->mutex);
                 mutex_unlock(&head->mutex);
                 btrfs_put_delayed_ref_head(head);
+                btrfs_put_transaction(cur_trans);
                 return -EAGAIN;
         }
         spin_unlock(&delayed_refs->lock);
@@ -3199,6 +3205,7 @@ static noinline int check_delayed_ref(struct btrfs_root *root,
         }
         spin_unlock(&head->lock);
         mutex_unlock(&head->mutex);
+        btrfs_put_transaction(cur_trans);
         return ret;
 }
 
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 00b7d3231821..b041b945a7ae 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1841,7 +1841,7 @@ again:
                 old_bytenr = btrfs_node_blockptr(parent, slot);
                 blocksize = fs_info->nodesize;
                 old_ptr_gen = btrfs_node_ptr_generation(parent, slot);
-                btrfs_node_key_to_cpu(parent, &key, slot);
+                btrfs_node_key_to_cpu(parent, &first_key, slot);
 
                 if (level <= max_level) {
                         eb = path->nodes[level];
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 221e5cdb060b..c0074d2d7d6d 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -5236,6 +5236,10 @@ static int send_write_or_clone(struct send_ctx *sctx,
                 len = btrfs_file_extent_num_bytes(path->nodes[0], ei);
         }
 
+        if (offset >= sctx->cur_inode_size) {
+                ret = 0;
+                goto out;
+        }
         if (offset + len > sctx->cur_inode_size)
                 len = sctx->cur_inode_size - offset;
         if (len == 0) {