summaryrefslogtreecommitdiff
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-05-16 16:46:24 +0300
committerDavid Sterba <dsterba@suse.com>2016-05-16 16:46:24 +0300
commit5ef64a3e757c94b2f2fc61465ef9603aaacaecff (patch)
tree5f8da3043723e98e8313ebf180fe84a9a12b8db0 /fs/btrfs/transaction.c
parent73d32ce21e1701eaafcea3cbc2a8f27ab1967abe (diff)
parente1860a7724828a341037b010b3f4ff58bad53f95 (diff)
downloadlinux-5ef64a3e757c94b2f2fc61465ef9603aaacaecff.tar.xz
Merge branch 'cleanups-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r--fs/btrfs/transaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 530081388d77..abf3a4604ac6 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -2231,7 +2231,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
ret = btrfs_write_and_wait_transaction(trans, root);
if (ret) {
- btrfs_std_error(root->fs_info, ret,
+ btrfs_handle_fs_error(root->fs_info, ret,
"Error while writing out transaction");
mutex_unlock(&root->fs_info->tree_log_mutex);
goto scrub_continue;