Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration

Conflicts:
	fs/btrfs/volumes.c

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

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/free-space-cache.c
Simple merge

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

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

diff --cc fs/btrfs/volumes.h
index 6faec9d,c1701ec..19ac950
--- 1/fs/btrfs/volumes.h
--- 2/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@@ -273,13 -228,8 +273,12 @@@ struct btrfs_device *btrfs_find_device(
                                       u8 *uuid, u8 *fsid);
  int btrfs_shrink_device(struct btrfs_device *device, u64 new_size);
  int btrfs_init_new_device(struct btrfs_root *root, char *path);
 -int btrfs_balance(struct btrfs_root *dev_root);
 +int btrfs_balance(struct btrfs_balance_control *bctl,
 +                struct btrfs_ioctl_balance_args *bargs);
 +int btrfs_recover_balance(struct btrfs_root *tree_root);
 +int btrfs_pause_balance(struct btrfs_fs_info *fs_info);
 +int btrfs_cancel_balance(struct btrfs_fs_info *fs_info);
  int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
- int find_free_dev_extent(struct btrfs_trans_handle *trans,
-                        struct btrfs_device *device, u64 num_bytes,
+ int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
                         u64 *start, u64 *max_avail);
  #endif