projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
super.c
diff --git
a/fs/btrfs/super.c
b/fs/btrfs/super.c
index a4807ced23cc5791d500d28ee9f91fdc915f5df0..f0857e092a3cb1af485604850052440579a1bbf1 100644
(file)
--- 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)