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/relocation.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/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 08ef890deca6..1c29514d8aff 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2418,7 +2418,7 @@ again: } out: if (ret) { - btrfs_std_error(root->fs_info, ret, NULL); + btrfs_handle_fs_error(root->fs_info, ret, NULL); if (!list_empty(&reloc_roots)) free_reloc_roots(&reloc_roots); |