aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2019-02-26 16:33:56 +0800
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-02 19:19:16 -0400
commitf6ff72aee4cb773ece72b1e2c2174034725695de (patch)
treebe31de4627f2141d9fdafe80c4f269e5a47d5e91 /fs
parenta6d451a4e8120d739ef24d99e37ee680d453bc2d (diff)
downloadlinux-yocto-f6ff72aee4cb773ece72b1e2c2174034725695de.tar.gz
linux-yocto-f6ff72aee4cb773ece72b1e2c2174034725695de.tar.bz2
linux-yocto-f6ff72aee4cb773ece72b1e2c2174034725695de.zip
btrfs: Don't panic when we can't find a root key
commit 7ac1e464c4d473b517bb784f30d40da1f842482e upstream. When we failed to find a root key in btrfs_update_root(), we just panic. That's definitely not cool, fix it by outputting an unique error message, aborting current transaction and return -EUCLEAN. This should not normally happen as the root has been used by the callers in some way. Reviewed-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/root-tree.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 787e2bcd96c8..481c4a08a98b 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -135,11 +135,14 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
if (ret < 0)
goto out;
- if (ret != 0) {
- btrfs_print_leaf(path->nodes[0]);
- btrfs_crit(fs_info, "unable to update root key %llu %u %llu",
- key->objectid, key->type, key->offset);
- BUG_ON(1);
+ if (ret > 0) {
+ btrfs_crit(fs_info,
+ "unable to find root key (%llu %u %llu) in tree %llu",
+ key->objectid, key->type, key->offset,
+ root->root_key.objectid);
+ ret = -EUCLEAN;
+ btrfs_abort_transaction(trans, ret);
+ goto out;
}
l = path->nodes[0];