Merge branch 'cleanups-4.7' into for-chris-4.7-20160516

2016-05-16 15:46:24 +02:00
parent 73d32ce21e e1860a7724
commit 5ef64a3e75
15 changed files with 178 additions and 192 deletions
--- 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;