6 files changed, 37 insertions, 14 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3f0b6d1936e8..6d776717d8b3 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -477,9 +477,9 @@ static int btree_read_extent_buffer_pages(struct btrfs_fs_info *fs_info,
         int mirror_num = 0;
         int failed_mirror = 0;
 
-        clear_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);
         io_tree = &BTRFS_I(fs_info->btree_inode)->io_tree;
         while (1) {
+                clear_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);
                 ret = read_extent_buffer_pages(io_tree, eb, WAIT_COMPLETE,
                                                mirror_num);
                 if (!ret) {
@@ -493,15 +493,6 @@ static int btree_read_extent_buffer_pages(struct btrfs_fs_info *fs_info,
                                 break;
                 }
 
-                /*
-                 * This buffer's crc is fine, but its contents are corrupted, so
-                 * there is no reason to read the other copies, they won't be
-                 * any less wrong.
-                 */
-                if (test_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags) ||
-                    ret == -EUCLEAN)
-                        break;
-
                 num_copies = btrfs_num_copies(fs_info,
                                               eb->start, eb->len);
                 if (num_copies == 1)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index a3c22e16509b..58e93bce3036 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2089,6 +2089,30 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
         atomic_inc(&root->log_batch);
 
         /*
+         * Before we acquired the inode's lock, someone may have dirtied more
+         * pages in the target range. We need to make sure that writeback for
+         * any such pages does not start while we are logging the inode, because
+         * if it does, any of the following might happen when we are not doing a
+         * full inode sync:
+         *
+         * 1) We log an extent after its writeback finishes but before its
+         *    checksums are added to the csum tree, leading to -EIO errors
+         *    when attempting to read the extent after a log replay.
+         *
+         * 2) We can end up logging an extent before its writeback finishes.
+         *    Therefore after the log replay we will have a file extent item
+         *    pointing to an unwritten extent (and no data checksums as well).
+         *
+         * So trigger writeback for any eventual new dirty pages and then we
+         * wait for all ordered extents to complete below.
+         */
+        ret = start_ordered_ops(inode, start, end);
+        if (ret) {
+                inode_unlock(inode);
+                goto out;
+        }
+
+        /*
          * We have to do this here to avoid the priority inversion of waiting on
          * IO of a lower priority task while holding a transaciton open.
          */
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 45868fd76209..f70825af6438 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2659,7 +2659,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,
         int i;
         u64 *i_qgroups;
         struct btrfs_fs_info *fs_info = trans->fs_info;
-        struct btrfs_root *quota_root = fs_info->quota_root;
+        struct btrfs_root *quota_root;
         struct btrfs_qgroup *srcgroup;
         struct btrfs_qgroup *dstgroup;
         u32 level_size = 0;
@@ -2669,6 +2669,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,
         if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags))
                 goto out;
 
+        quota_root = fs_info->quota_root;
         if (!quota_root) {
                 ret = -EINVAL;
                 goto out;
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 924116f654a1..a3f75b8926d4 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3959,6 +3959,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
 restart:
                 if (update_backref_cache(trans, &rc->backref_cache)) {
                         btrfs_end_transaction(trans);
+                        trans = NULL;
                         continue;
                 }
 
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 094cc1444a90..5be83b5a1b43 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -3340,7 +3340,8 @@ static void free_pending_move(struct send_ctx *sctx, struct pending_dir_move *m)
         kfree(m);
 }
 
-static void tail_append_pending_moves(struct pending_dir_move *moves,
+static void tail_append_pending_moves(struct send_ctx *sctx,
+                                      struct pending_dir_move *moves,
                                       struct list_head *stack)
 {
         if (list_empty(&moves->list)) {
@@ -3351,6 +3352,10 @@ static void tail_append_pending_moves(struct pending_dir_move *moves,
                 list_add_tail(&moves->list, stack);
                 list_splice_tail(&list, stack);
         }
+        if (!RB_EMPTY_NODE(&moves->node)) {
+                rb_erase(&moves->node, &sctx->pending_dir_moves);
+                RB_CLEAR_NODE(&moves->node);
+        }
 }
 
 static int apply_children_dir_moves(struct send_ctx *sctx)
@@ -3365,7 +3370,7 @@ static int apply_children_dir_moves(struct send_ctx *sctx)
                 return 0;
 
         INIT_LIST_HEAD(&stack);
-        tail_append_pending_moves(pm, &stack);
+        tail_append_pending_moves(sctx, pm, &stack);
 
         while (!list_empty(&stack)) {
                 pm = list_first_entry(&stack, struct pending_dir_move, list);
@@ -3376,7 +3381,7 @@ static int apply_children_dir_moves(struct send_ctx *sctx)
                         goto out;
                 pm = get_pending_dir_moves(sctx, parent_ino);
                 if (pm)
-                        tail_append_pending_moves(pm, &stack);
+                        tail_append_pending_moves(sctx, pm, &stack);
         }
         return 0;
 
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index cbc9d0d2c12d..645fc81e2a94 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2237,6 +2237,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
         vol = memdup_user((void __user *)arg, sizeof(*vol));
         if (IS_ERR(vol))
                 return PTR_ERR(vol);
+        vol->name[BTRFS_PATH_NAME_MAX] = '\0';
 
         switch (cmd) {
         case BTRFS_IOC_SCAN_DEV: