diff options
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 391bd3ddaed3..d31a0c4f56be 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -2788,7 +2788,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, | |||
2788 | ret = btrfs_write_marked_extents(log, &log->dirty_log_pages, mark); | 2788 | ret = btrfs_write_marked_extents(log, &log->dirty_log_pages, mark); |
2789 | if (ret) { | 2789 | if (ret) { |
2790 | blk_finish_plug(&plug); | 2790 | blk_finish_plug(&plug); |
2791 | btrfs_abort_transaction(trans, root, ret); | 2791 | btrfs_abort_transaction(trans, ret); |
2792 | btrfs_free_logged_extents(log, log_transid); | 2792 | btrfs_free_logged_extents(log, log_transid); |
2793 | btrfs_set_log_full_commit(root->fs_info, trans); | 2793 | btrfs_set_log_full_commit(root->fs_info, trans); |
2794 | mutex_unlock(&root->log_mutex); | 2794 | mutex_unlock(&root->log_mutex); |
@@ -2838,7 +2838,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, | |||
2838 | btrfs_set_log_full_commit(root->fs_info, trans); | 2838 | btrfs_set_log_full_commit(root->fs_info, trans); |
2839 | 2839 | ||
2840 | if (ret != -ENOSPC) { | 2840 | if (ret != -ENOSPC) { |
2841 | btrfs_abort_transaction(trans, root, ret); | 2841 | btrfs_abort_transaction(trans, ret); |
2842 | mutex_unlock(&log_root_tree->log_mutex); | 2842 | mutex_unlock(&log_root_tree->log_mutex); |
2843 | goto out; | 2843 | goto out; |
2844 | } | 2844 | } |
@@ -2898,7 +2898,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, | |||
2898 | blk_finish_plug(&plug); | 2898 | blk_finish_plug(&plug); |
2899 | if (ret) { | 2899 | if (ret) { |
2900 | btrfs_set_log_full_commit(root->fs_info, trans); | 2900 | btrfs_set_log_full_commit(root->fs_info, trans); |
2901 | btrfs_abort_transaction(trans, root, ret); | 2901 | btrfs_abort_transaction(trans, ret); |
2902 | btrfs_free_logged_extents(log, log_transid); | 2902 | btrfs_free_logged_extents(log, log_transid); |
2903 | mutex_unlock(&log_root_tree->log_mutex); | 2903 | mutex_unlock(&log_root_tree->log_mutex); |
2904 | goto out_wake_log_root; | 2904 | goto out_wake_log_root; |
@@ -2934,7 +2934,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, | |||
2934 | ret = write_ctree_super(trans, root->fs_info->tree_root, 1); | 2934 | ret = write_ctree_super(trans, root->fs_info->tree_root, 1); |
2935 | if (ret) { | 2935 | if (ret) { |
2936 | btrfs_set_log_full_commit(root->fs_info, trans); | 2936 | btrfs_set_log_full_commit(root->fs_info, trans); |
2937 | btrfs_abort_transaction(trans, root, ret); | 2937 | btrfs_abort_transaction(trans, ret); |
2938 | goto out_wake_log_root; | 2938 | goto out_wake_log_root; |
2939 | } | 2939 | } |
2940 | 2940 | ||
@@ -2991,7 +2991,7 @@ static void free_log_tree(struct btrfs_trans_handle *trans, | |||
2991 | ret = walk_log_tree(trans, log, &wc); | 2991 | ret = walk_log_tree(trans, log, &wc); |
2992 | /* I don't think this can happen but just in case */ | 2992 | /* I don't think this can happen but just in case */ |
2993 | if (ret) | 2993 | if (ret) |
2994 | btrfs_abort_transaction(trans, log, ret); | 2994 | btrfs_abort_transaction(trans, ret); |
2995 | 2995 | ||
2996 | while (1) { | 2996 | while (1) { |
2997 | ret = find_first_extent_bit(&log->dirty_log_pages, | 2997 | ret = find_first_extent_bit(&log->dirty_log_pages, |
@@ -3160,7 +3160,7 @@ out_unlock: | |||
3160 | btrfs_set_log_full_commit(root->fs_info, trans); | 3160 | btrfs_set_log_full_commit(root->fs_info, trans); |
3161 | ret = 0; | 3161 | ret = 0; |
3162 | } else if (ret < 0) | 3162 | } else if (ret < 0) |
3163 | btrfs_abort_transaction(trans, root, ret); | 3163 | btrfs_abort_transaction(trans, ret); |
3164 | 3164 | ||
3165 | btrfs_end_log_trans(root); | 3165 | btrfs_end_log_trans(root); |
3166 | 3166 | ||
@@ -3193,7 +3193,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, | |||
3193 | btrfs_set_log_full_commit(root->fs_info, trans); | 3193 | btrfs_set_log_full_commit(root->fs_info, trans); |
3194 | ret = 0; | 3194 | ret = 0; |
3195 | } else if (ret < 0 && ret != -ENOENT) | 3195 | } else if (ret < 0 && ret != -ENOENT) |
3196 | btrfs_abort_transaction(trans, root, ret); | 3196 | btrfs_abort_transaction(trans, ret); |
3197 | btrfs_end_log_trans(root); | 3197 | btrfs_end_log_trans(root); |
3198 | 3198 | ||
3199 | return ret; | 3199 | return ret; |