diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-05-17 21:53:17 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-05-17 21:53:17 -0400 |
| commit | c5cb6a0573bef87e098ee3cd946115ebe60a910e (patch) | |
| tree | 49b64747b7af6b1024b25470cba583fa7dafe531 /fs/btrfs/super.c | |
| parent | 9be3395bcd4ad4af76476ac38152b4cafa6b6159 (diff) | |
| parent | 655b09fe540b73edeaabfb4c2d700be51a1f8bce (diff) | |
| download | linux-c5cb6a0573bef87e098ee3cd946115ebe60a910e.tar.gz linux-c5cb6a0573bef87e098ee3cd946115ebe60a910e.tar.xz | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index a4807ced23cc..f0857e092a3c 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1263,6 +1263,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) btrfs_dev_replace_suspend_for_unmount(fs_info); btrfs_scrub_cancel(fs_info); + btrfs_pause_balance(fs_info); ret = btrfs_commit_super(root); if (ret) |