Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 20 insertions, 0 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7effed6f2fa6..0ec3acd14cbf 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8829,6 +8829,24 @@ again:
                 goto again;
         }
 
+        /*
+         * if we are changing raid levels, try to allocate a corresponding
+         * block group with the new raid level.
+         */
+        alloc_flags = update_block_group_flags(root, cache->flags);
+        if (alloc_flags != cache->flags) {
+                ret = do_chunk_alloc(trans, root, alloc_flags,
+                                     CHUNK_ALLOC_FORCE);
+                /*
+                 * ENOSPC is allowed here, we may have enough space
+                 * already allocated at the new raid level to
+                 * carry on
+                 */
+                if (ret == -ENOSPC)
+                        ret = 0;
+                if (ret < 0)
+                        goto out;
+        }
 
         ret = set_block_group_ro(cache, 0);
         if (!ret)
@@ -8842,7 +8860,9 @@ again:
 out:
         if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {
                 alloc_flags = update_block_group_flags(root, cache->flags);
+                lock_chunks(root->fs_info->chunk_root);
                 check_system_chunk(trans, root, alloc_flags);
+                unlock_chunks(root->fs_info->chunk_root);
         }
         mutex_unlock(&root->fs_info->ro_block_group_mutex);