From: Chris Mason Date: Mon, 16 Jan 2012 20:26:17 +0000 (-0500) Subject: Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d756bd2d9339447c29bde950910586df8f8941ec;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration Conflicts: fs/btrfs/volumes.c Signed-off-by: Chris Mason --- d756bd2d9339447c29bde950910586df8f8941ec diff --cc fs/btrfs/volumes.h index 6faec9dd1f93,c1701ec9d49f..19ac95048b88 --- a/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