4 files changed, 6 insertions, 16 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 67385033323d..f5434ad49b99 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1135,9 +1135,6 @@ struct btrfs_fs_info {
         u64 avail_data_alloc_bits;
         u64 avail_metadata_alloc_bits;
         u64 avail_system_alloc_bits;
-        u64 data_alloc_profile;
-        u64 metadata_alloc_profile;
-        u64 system_alloc_profile;
 
         unsigned data_chunk_allocations;
         unsigned metadata_ratio;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3f9d5551e582..ce9d0fb3627d 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2321,9 +2321,6 @@ retry_root_backup:
 
         fs_info->generation = generation;
         fs_info->last_trans_committed = generation;
-        fs_info->data_alloc_profile = (u64)-1;
-        fs_info->metadata_alloc_profile = (u64)-1;
-        fs_info->system_alloc_profile = fs_info->metadata_alloc_profile;
 
         ret = btrfs_init_space_info(fs_info);
         if (ret) {
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8603ee4e3dfd..f0591fd66249 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3067,14 +3067,12 @@ u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags)
 static u64 get_alloc_profile(struct btrfs_root *root, u64 flags)
 {
         if (flags & BTRFS_BLOCK_GROUP_DATA)
-                flags |= root->fs_info->avail_data_alloc_bits &
-                         root->fs_info->data_alloc_profile;
+                flags |= root->fs_info->avail_data_alloc_bits;
         else if (flags & BTRFS_BLOCK_GROUP_SYSTEM)
-                flags |= root->fs_info->avail_system_alloc_bits &
-                         root->fs_info->system_alloc_profile;
+                flags |= root->fs_info->avail_system_alloc_bits;
         else if (flags & BTRFS_BLOCK_GROUP_METADATA)
-                flags |= root->fs_info->avail_metadata_alloc_bits &
-                         root->fs_info->metadata_alloc_profile;
+                flags |= root->fs_info->avail_metadata_alloc_bits;
+
         return btrfs_reduce_alloc_profile(root, flags);
 }
 
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f4b839fd3c9d..89096f6d6fb4 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2752,8 +2752,7 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
                 return ret;
 
         alloc_profile = BTRFS_BLOCK_GROUP_METADATA |
-                        (fs_info->metadata_alloc_profile &
-                         fs_info->avail_metadata_alloc_bits);
+                                fs_info->avail_metadata_alloc_bits;
         alloc_profile = btrfs_reduce_alloc_profile(root, alloc_profile);
 
         ret = __btrfs_alloc_chunk(trans, extent_root, &map, &chunk_size,
@@ -2763,8 +2762,7 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
         sys_chunk_offset = chunk_offset + chunk_size;
 
         alloc_profile = BTRFS_BLOCK_GROUP_SYSTEM |
-                        (fs_info->system_alloc_profile &
-                         fs_info->avail_system_alloc_bits);
+                                fs_info->avail_system_alloc_bits;
         alloc_profile = btrfs_reduce_alloc_profile(root, alloc_profile);
 
         ret = __btrfs_alloc_chunk(trans, extent_root, &sys_map,