diff options
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r-- | fs/btrfs/transaction.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index e51d2bc532f..cdbb5022da5 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -42,10 +42,8 @@ static noinline void put_transaction(struct btrfs_transaction *transaction) | |||
42 | 42 | ||
43 | static noinline void switch_commit_root(struct btrfs_root *root) | 43 | static noinline void switch_commit_root(struct btrfs_root *root) |
44 | { | 44 | { |
45 | down_write(&root->commit_root_sem); | ||
46 | free_extent_buffer(root->commit_root); | 45 | free_extent_buffer(root->commit_root); |
47 | root->commit_root = btrfs_root_node(root); | 46 | root->commit_root = btrfs_root_node(root); |
48 | up_write(&root->commit_root_sem); | ||
49 | } | 47 | } |
50 | 48 | ||
51 | /* | 49 | /* |
@@ -466,7 +464,10 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans, | |||
466 | ret = btrfs_write_dirty_block_groups(trans, root); | 464 | ret = btrfs_write_dirty_block_groups(trans, root); |
467 | BUG_ON(ret); | 465 | BUG_ON(ret); |
468 | } | 466 | } |
469 | switch_commit_root(root); | 467 | |
468 | if (root != root->fs_info->extent_root) | ||
469 | switch_commit_root(root); | ||
470 | |||
470 | return 0; | 471 | return 0; |
471 | } | 472 | } |
472 | 473 | ||
@@ -499,6 +500,11 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans, | |||
499 | 500 | ||
500 | update_cowonly_root(trans, root); | 501 | update_cowonly_root(trans, root); |
501 | } | 502 | } |
503 | |||
504 | down_write(&fs_info->extent_commit_sem); | ||
505 | switch_commit_root(fs_info->extent_root); | ||
506 | up_write(&fs_info->extent_commit_sem); | ||
507 | |||
502 | return 0; | 508 | return 0; |
503 | } | 509 | } |
504 | 510 | ||
@@ -851,6 +857,16 @@ static void update_super_roots(struct btrfs_root *root) | |||
851 | super->root_level = root_item->level; | 857 | super->root_level = root_item->level; |
852 | } | 858 | } |
853 | 859 | ||
860 | int btrfs_transaction_in_commit(struct btrfs_fs_info *info) | ||
861 | { | ||
862 | int ret = 0; | ||
863 | spin_lock(&info->new_trans_lock); | ||
864 | if (info->running_transaction) | ||
865 | ret = info->running_transaction->in_commit; | ||
866 | spin_unlock(&info->new_trans_lock); | ||
867 | return ret; | ||
868 | } | ||
869 | |||
854 | int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | 870 | int btrfs_commit_transaction(struct btrfs_trans_handle *trans, |
855 | struct btrfs_root *root) | 871 | struct btrfs_root *root) |
856 | { | 872 | { |