diff options
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r-- | fs/btrfs/transaction.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 3e8225de4e9d..2869b3361eb6 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -972,6 +972,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | |||
972 | int ret; | 972 | int ret; |
973 | int should_grow = 0; | 973 | int should_grow = 0; |
974 | unsigned long now = get_seconds(); | 974 | unsigned long now = get_seconds(); |
975 | int flush_on_commit = btrfs_test_opt(root, FLUSHONCOMMIT); | ||
975 | 976 | ||
976 | btrfs_run_ordered_operations(root, 0); | 977 | btrfs_run_ordered_operations(root, 0); |
977 | 978 | ||
@@ -1051,7 +1052,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | |||
1051 | 1052 | ||
1052 | mutex_unlock(&root->fs_info->trans_mutex); | 1053 | mutex_unlock(&root->fs_info->trans_mutex); |
1053 | 1054 | ||
1054 | if (snap_pending) { | 1055 | if (flush_on_commit || snap_pending) { |
1056 | if (flush_on_commit) | ||
1057 | btrfs_start_delalloc_inodes(root); | ||
1055 | ret = btrfs_wait_ordered_extents(root, 1); | 1058 | ret = btrfs_wait_ordered_extents(root, 1); |
1056 | BUG_ON(ret); | 1059 | BUG_ON(ret); |
1057 | } | 1060 | } |