From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 22 Jun 2012 18:14:13 +0000 (-0600)
Subject: Btrfs: do not ignore errors from btrfs_cleanup_fs_roots() when mounting
X-Git-Tag: upstream/snapshot3+hdmi~6698^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44c44af2f4a6dc1595f1711cf307bd01062fd129;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

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 @@ 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) {