btrfs: sink gfp parameter to set_record_extent_bits

Single caller passes GFP_NOFS.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 164bda63c5ac116c02bfb1f9766aa8ca42bf225e..0c9b11924f7457863a4dec3217c0014dab49742e 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1284,8 +1284,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
 
 /* wrappers around set/clear extent bit */
 int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                          unsigned bits, gfp_t mask,
-                          struct extent_changeset *changeset)
+                          unsigned bits, struct extent_changeset *changeset)
 {
        /*
         * We don't support EXTENT_LOCKED yet, as current changeset will
@@ -1295,7 +1294,7 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
         */
        BUG_ON(bits & EXTENT_LOCKED);
 
-       return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, mask,
+       return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
                                changeset);
 }
 

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 566cf86d7e634bc81f95a54bf88e7793200d8ec7..94b37644604298748d8380ff06ac85e3126cab18 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -252,8 +252,7 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
 }
 
 int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                          unsigned bits, gfp_t mask,
-                          struct extent_changeset *changeset);
+                          unsigned bits, struct extent_changeset *changeset);
 int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                   unsigned bits, u64 *failed_start,
                   struct extent_state **cached_state, gfp_t mask);

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 129392a78986b89161ca9d2d0cd350af733c25a3..34af959b4e0f9f26d619fb0877ee317762e0abad 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2542,8 +2542,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len)
        changeset.bytes_changed = 0;
        changeset.range_changed = ulist_alloc(GFP_NOFS);
        ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start,
-                       start + len -1, EXTENT_QGROUP_RESERVED, GFP_NOFS,
-                       &changeset);
+                       start + len -1, EXTENT_QGROUP_RESERVED, &changeset);
        trace_btrfs_qgroup_reserve_data(inode, start, len,
                                        changeset.bytes_changed,
                                        QGROUP_RESERVE);