btrfs: open code set_extent_bits_nowait

The helper only passes GFP_NOWAIT as gfp flags and is used two times.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 0fc5454..ef9d54c 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -156,12 +156,6 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
 int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                   u32 bits, struct extent_state **cached_state, gfp_t mask);
 
-static inline int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start,
-                                        u64 end, u32 bits)
-{
-       return set_extent_bit(tree, start, end, bits, NULL, GFP_NOWAIT);
-}
-
 static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
                u64 end, u32 bits)
 {

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 138afa9..918ce12 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -364,8 +364,9 @@ static void extent_map_device_set_bits(struct extent_map *em, unsigned bits)
                struct btrfs_io_stripe *stripe = &map->stripes[i];
                struct btrfs_device *device = stripe->dev;
 
-               set_extent_bits_nowait(&device->alloc_state, stripe->physical,
-                                stripe->physical + stripe_size - 1, bits);
+               set_extent_bit(&device->alloc_state, stripe->physical,
+                              stripe->physical + stripe_size - 1, bits, NULL,
+                              GFP_NOWAIT);
        }
 }
 

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index bda301a..b82a350 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1611,8 +1611,8 @@ void btrfs_redirty_list_add(struct btrfs_transaction *trans,
        memzero_extent_buffer(eb, 0, eb->len);
        set_bit(EXTENT_BUFFER_NO_CHECK, &eb->bflags);
        set_extent_buffer_dirty(eb);
-       set_extent_bits_nowait(&trans->dirty_pages, eb->start,
-                              eb->start + eb->len - 1, EXTENT_DIRTY);
+       set_extent_bit(&trans->dirty_pages, eb->start, eb->start + eb->len - 1,
+                       EXTENT_DIRTY, NULL, GFP_NOWAIT);
 }
 
 bool btrfs_use_zone_append(struct btrfs_bio *bbio)