]> git.hungrycats.org Git - linux/commitdiff
btrfs: make state preallocation more speculative in __set_extent_bit
authorDavid Sterba <dsterba@suse.com>
Tue, 26 Apr 2016 23:03:45 +0000 (01:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jun 2016 01:18:56 +0000 (18:18 -0700)
commit 059f791c6bbaba72dc3c1bd6e2657aacc8552849 upstream.

Similar to __clear_extent_bit, do not fail if the state preallocation
fails as we might not need it. One less BUG_ON.

Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/extent_io.c

index 57fccc420697e67d5d40d906b0607160976f3225..b5ff48d6a0c5b34b1f0d08fd874505f316fd2ac3 100644 (file)
@@ -875,8 +875,14 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
        bits |= EXTENT_FIRST_DELALLOC;
 again:
        if (!prealloc && gfpflags_allow_blocking(mask)) {
+               /*
+                * Don't care for allocation failure here because we might end
+                * up not needing the pre-allocated extent state at all, which
+                * is the case if we only have in the tree extent states that
+                * cover our input range and don't cover too any other range.
+                * If we end up needing a new extent state we allocate it later.
+                */
                prealloc = alloc_extent_state(mask);
-               BUG_ON(!prealloc);
        }
 
        spin_lock(&tree->lock);