Skip to content

Commit 2c53b91

Browse files
committed
btrfs: sink gfp parameter to set_record_extent_bits
Single caller passes GFP_NOFS. Signed-off-by: David Sterba <[email protected]>
1 parent 3744dbe commit 2c53b91

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

fs/btrfs/extent_io.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,8 +1284,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
12841284

12851285
/* wrappers around set/clear extent bit */
12861286
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
1287-
unsigned bits, gfp_t mask,
1288-
struct extent_changeset *changeset)
1287+
unsigned bits, struct extent_changeset *changeset)
12891288
{
12901289
/*
12911290
* 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,
12951294
*/
12961295
BUG_ON(bits & EXTENT_LOCKED);
12971296

1298-
return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, mask,
1297+
return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
12991298
changeset);
13001299
}
13011300

fs/btrfs/extent_io.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,7 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
252252
}
253253

254254
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
255-
unsigned bits, gfp_t mask,
256-
struct extent_changeset *changeset);
255+
unsigned bits, struct extent_changeset *changeset);
257256
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
258257
unsigned bits, u64 *failed_start,
259258
struct extent_state **cached_state, gfp_t mask);

fs/btrfs/qgroup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2542,8 +2542,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len)
25422542
changeset.bytes_changed = 0;
25432543
changeset.range_changed = ulist_alloc(GFP_NOFS);
25442544
ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start,
2545-
start + len -1, EXTENT_QGROUP_RESERVED, GFP_NOFS,
2546-
&changeset);
2545+
start + len -1, EXTENT_QGROUP_RESERVED, &changeset);
25472546
trace_btrfs_qgroup_reserve_data(inode, start, len,
25482547
changeset.bytes_changed,
25492548
QGROUP_RESERVE);

0 commit comments

Comments
 (0)