diff options
| author | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
| commit | c23fed1d9173bf85b0fca069c2f24771e2d4e546 (patch) | |
| tree | 8c0cddaea87050ba51cc209a2332ac03e3e3fabc /fs/btrfs/disk-io.c | |
| parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) | |
| parent | f674bd281460451e8784f3bc917a650e8937a8ed (diff) | |
| download | talos-op-linux-c23fed1d9173bf85b0fca069c2f24771e2d4e546.tar.gz talos-op-linux-c23fed1d9173bf85b0fca069c2f24771e2d4e546.zip | |
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into asoc-amd
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 487bbe4fb3c6..dfdab849037b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3643,7 +3643,14 @@ int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors) u64 flags; do_barriers = !btrfs_test_opt(fs_info, NOBARRIER); - backup_super_roots(fs_info); + + /* + * max_mirrors == 0 indicates we're from commit_transaction, + * not from fsync where the tree roots in fs_info have not + * been consistent on disk. + */ + if (max_mirrors == 0) + backup_super_roots(fs_info); sb = fs_info->super_for_commit; dev_item = &sb->dev_item; |
