diff options
| author | Ilya Dryomov | 2012-06-22 20:24:12 +0200 |
|---|---|---|
| committer | Chris Mason | 2012-07-02 21:39:16 +0200 |
| commit | 68310a5e42f93c2242ec1836c3b18d531e0065e2 (patch) | |
| tree | cf457369274a1633ba02170fcb6aab0114906f0a /fs/btrfs/volumes.h | |
| parent | Btrfs: fix dio write vs buffered read race (diff) | |
| download | kernel-qcow2-linux-68310a5e42f93c2242ec1836c3b18d531e0065e2.tar.gz kernel-qcow2-linux-68310a5e42f93c2242ec1836c3b18d531e0065e2.tar.xz kernel-qcow2-linux-68310a5e42f93c2242ec1836c3b18d531e0065e2.zip | |
Btrfs: restore restriper state on all mounts
Fix a bug that triggered asserts in btrfs_balance() in both normal and
resume modes -- restriper state was not properly restored on read-only
mounts. This factors out resuming code from btrfs_restore_balance(),
which is now also called earlier in the mount sequence to avoid the
problem of some early writes getting the old profile.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 74366f27a76b..e1b1a649fc5a 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -281,7 +281,7 @@ 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_balance_control *bctl, struct btrfs_ioctl_balance_args *bargs); -int btrfs_recover_balance(struct btrfs_root *tree_root); +int btrfs_recover_balance(struct btrfs_fs_info *fs_info); 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); |