Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index ec7928a27aaa..decd0a3f5d61 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1011,7 +1011,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                         return ret;
                 if (refs == 0) {
                         ret = -EROFS;
-                        btrfs_std_error(root->fs_info, ret, NULL);
+                        btrfs_handle_fs_error(root->fs_info, ret, NULL);
                         return ret;
                 }
         } else {
@@ -1928,7 +1928,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                 child = read_node_slot(root, mid, 0);
                 if (!child) {
                         ret = -EROFS;
-                        btrfs_std_error(root->fs_info, ret, NULL);
+                        btrfs_handle_fs_error(root->fs_info, ret, NULL);
                         goto enospc;
                 }
 
@@ -2031,7 +2031,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                  */
                 if (!left) {
                         ret = -EROFS;
-                        btrfs_std_error(root->fs_info, ret, NULL);
+                        btrfs_handle_fs_error(root->fs_info, ret, NULL);
                         goto enospc;
                 }
                 wret = balance_node_right(trans, root, mid, left);