diff options
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index a794b9f60138..b4c191d6c774 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -614,7 +614,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, | |||
614 | 614 | ||
615 | ret = btrfs_lookup_csums_range(root->log_root, | 615 | ret = btrfs_lookup_csums_range(root->log_root, |
616 | csum_start, csum_end - 1, | 616 | csum_start, csum_end - 1, |
617 | &ordered_sums); | 617 | &ordered_sums, 0); |
618 | BUG_ON(ret); | 618 | BUG_ON(ret); |
619 | while (!list_empty(&ordered_sums)) { | 619 | while (!list_empty(&ordered_sums)) { |
620 | struct btrfs_ordered_sum *sums; | 620 | struct btrfs_ordered_sum *sums; |
@@ -2094,7 +2094,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, | |||
2094 | * the running transaction open, so a full commit can't hop | 2094 | * the running transaction open, so a full commit can't hop |
2095 | * in and cause problems either. | 2095 | * in and cause problems either. |
2096 | */ | 2096 | */ |
2097 | btrfs_scrub_pause_super(root); | ||
2097 | write_ctree_super(trans, root->fs_info->tree_root, 1); | 2098 | write_ctree_super(trans, root->fs_info->tree_root, 1); |
2099 | btrfs_scrub_continue_super(root); | ||
2098 | ret = 0; | 2100 | ret = 0; |
2099 | 2101 | ||
2100 | mutex_lock(&root->log_mutex); | 2102 | mutex_lock(&root->log_mutex); |
@@ -2689,7 +2691,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, | |||
2689 | ret = btrfs_lookup_csums_range( | 2691 | ret = btrfs_lookup_csums_range( |
2690 | log->fs_info->csum_root, | 2692 | log->fs_info->csum_root, |
2691 | ds + cs, ds + cs + cl - 1, | 2693 | ds + cs, ds + cs + cl - 1, |
2692 | &ordered_sums); | 2694 | &ordered_sums, 0); |
2693 | BUG_ON(ret); | 2695 | BUG_ON(ret); |
2694 | } | 2696 | } |
2695 | } | 2697 | } |