Btrfs: do not ignore errors from btrfs_cleanup_fs_roots() when mounting
authorIlya Dryomov <idryomov@gmail.com>
Fri, 22 Jun 2012 18:14:13 +0000 (12:14 -0600)
committerChris Mason <chris.mason@fusionio.com>
Mon, 23 Jul 2012 20:27:53 +0000 (16:27 -0400)
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>
fs/btrfs/disk-io.c

index fd216d9369faaa365bd72d53875898a3ee8103fd..dd6676b446f654cb6ce6140a68c5c265432cd4d9 100644 (file)
@@ -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) {