commit 44c44af2f4a6dc1595f1711cf307bd01062fd129
author Ilya Dryomov <idryomov@gmail.com> Fri Jun 22 12:14:13 2012 -0600
committer Chris Mason <chris.mason@fusionio.com> Mon Jul 23 16:27:53 2012 -0400
tree b20bfeeca76fd9396d0ddf9783d55344caa6d0c7
parent fed425c742cb1262ce90a41f2d3d211bac099533

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>

fs/btrfs/disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index fd216d9..dd6676b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2466,8 +2466,8 @@
 
 	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) {