Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...

Conflicts:
	fs/btrfs/extent-tree.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/extent-tree.c
index d2a7ff53e99a1b30ce161874f39b137ff692273d,33785333f293f1fc7ab671f00e9ed88b1d3de038..372fd224a11d018ddf896693df564bf261224d4f
--- 1/fs/btrfs/extent-tree.c
--- 2/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@@ -8389,10 -8122,9 +8423,11 @@@ int btrfs_remove_block_group(struct btr
        struct btrfs_path *path;
        struct btrfs_block_group_cache *block_group;
        struct btrfs_free_cluster *cluster;
 +      struct btrfs_root *tree_root = root->fs_info->tree_root;
        struct btrfs_key key;
 +      struct inode *inode;
        int ret;
+       int factor;
  
        root = root->fs_info->extent_root;
  
@@@ -8473,10 -8179,9 +8516,11 @@@
        spin_lock(&block_group->space_info->lock);
        block_group->space_info->total_bytes -= block_group->key.offset;
        block_group->space_info->bytes_readonly -= block_group->key.offset;
+       block_group->space_info->disk_total -= block_group->key.offset * factor;
        spin_unlock(&block_group->space_info->lock);
  
 +      memcpy(&key, &block_group->key, sizeof(key));
 +
        btrfs_clear_space_info_full(root->fs_info);
  
        btrfs_put_block_group(block_group);

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/relocation.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge