]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Btrfs: return EIO if we have extent tree corruption
authorJosef Bacik <jbacik@fusionio.com>
Fri, 8 Mar 2013 20:41:02 +0000 (15:41 -0500)
committerChris Mason <chris.mason@fusionio.com>
Thu, 14 Mar 2013 18:57:29 +0000 (14:57 -0400)
The callers of lookup_inline_extent_info all handle getting an error back
properly, so return an error if we have corruption instead of being a jerk and
panicing.  Still WARN_ON() since this is kind of crucial and I've been seeing it
a bit too much recently for my taste, I think we're doing something wrong
somewhere.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/extent-tree.c

index aaee2b7fee78ee66c9479f05ca1993c227214712..350b9b18140c500e4b9a23acae2a5b34ad376e8d 100644 (file)
@@ -1467,8 +1467,11 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
        if (ret && !insert) {
                err = -ENOENT;
                goto out;
+       } else if (ret) {
+               err = -EIO;
+               WARN_ON(1);
+               goto out;
        }
-       BUG_ON(ret); /* Corruption */
 
        leaf = path->nodes[0];
        item_size = btrfs_item_size_nr(leaf, path->slots[0]);