summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2012-06-22 12:14:13 -0600
committerChris Mason <chris.mason@fusionio.com>2012-07-23 16:27:53 -0400
commit44c44af2f4a6dc1595f1711cf307bd01062fd129 (patch)
treeb20bfeeca76fd9396d0ddf9783d55344caa6d0c7 /fs
parentfed425c742cb1262ce90a41f2d3d211bac099533 (diff)
downloadlinux-44c44af2f4a6dc1595f1711cf307bd01062fd129.tar.gz
linux-44c44af2f4a6dc1595f1711cf307bd01062fd129.tar.bz2
linux-44c44af2f4a6dc1595f1711cf307bd01062fd129.zip
Btrfs: do not ignore errors from btrfs_cleanup_fs_roots() when mounting
There used to be a BUG_ON(ret) there before EH patch (79787eaa) went in. Bail out with EINVAL. Cc: David Sterba <dsterba@suse.cz> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index fd216d9369fa..dd6676b446f6 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2466,8 +2466,8 @@ retry_root_backup:
if (!(sb->s_flags & MS_RDONLY)) {
ret = btrfs_cleanup_fs_roots(fs_info);
- if (ret) {
- }
+ if (ret)
+ goto fail_trans_kthread;
ret = btrfs_recover_relocation(tree_root);
if (ret < 0) {