diff options
| author | Chris Mason <[email protected]> | 2016-05-17 21:24:44 +0000 |
|---|---|---|
| committer | Chris Mason <[email protected]> | 2016-05-17 21:24:44 +0000 |
| commit | a88336d13c66fc171f336c6332fcb67339894e08 (patch) | |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/ctree.c | |
| parent | Linux 4.6-rc5 (diff) | |
| parent | Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516 (diff) | |
| download | kernel-a88336d13c66fc171f336c6332fcb67339894e08.tar.gz kernel-a88336d13c66fc171f336c6332fcb67339894e08.zip | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 6 |
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); |