Skip to content

Commit f7a52a4

Browse files
kdaveJosef Bacik
authored andcommitted
btrfs: remove unused gfp mask parameter from release_extent_buffer callchain
It's unused since 0b32f4b. Signed-off-by: David Sterba <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
1 parent 34c2b29 commit f7a52a4

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

fs/btrfs/disk-io.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -966,14 +966,8 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags)
966966
{
967967
if (PageWriteback(page) || PageDirty(page))
968968
return 0;
969-
/*
970-
* We need to mask out eg. __GFP_HIGHMEM and __GFP_DMA32 as we're doing
971-
* slab allocation from alloc_extent_state down the callchain where
972-
* it'd hit a BUG_ON as those flags are not allowed.
973-
*/
974-
gfp_flags &= ~GFP_SLAB_BUG_MASK;
975969

976-
return try_release_extent_buffer(page, gfp_flags);
970+
return try_release_extent_buffer(page);
977971
}
978972

979973
static void btree_invalidatepage(struct page *page, unsigned long offset)

fs/btrfs/extent_io.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4450,7 +4450,7 @@ static inline void btrfs_release_extent_buffer_rcu(struct rcu_head *head)
44504450
}
44514451

44524452
/* Expects to have eb->eb_lock already held */
4453-
static int release_extent_buffer(struct extent_buffer *eb, gfp_t mask)
4453+
static int release_extent_buffer(struct extent_buffer *eb)
44544454
{
44554455
WARN_ON(atomic_read(&eb->refs) == 0);
44564456
if (atomic_dec_and_test(&eb->refs)) {
@@ -4508,7 +4508,7 @@ void free_extent_buffer(struct extent_buffer *eb)
45084508
* I know this is terrible, but it's temporary until we stop tracking
45094509
* the uptodate bits and such for the extent buffers.
45104510
*/
4511-
release_extent_buffer(eb, GFP_ATOMIC);
4511+
release_extent_buffer(eb);
45124512
}
45134513

45144514
void free_extent_buffer_stale(struct extent_buffer *eb)
@@ -4522,7 +4522,7 @@ void free_extent_buffer_stale(struct extent_buffer *eb)
45224522
if (atomic_read(&eb->refs) == 2 && !extent_buffer_under_io(eb) &&
45234523
test_and_clear_bit(EXTENT_BUFFER_TREE_REF, &eb->bflags))
45244524
atomic_dec(&eb->refs);
4525-
release_extent_buffer(eb, GFP_NOFS);
4525+
release_extent_buffer(eb);
45264526
}
45274527

45284528
void clear_extent_buffer_dirty(struct extent_buffer *eb)
@@ -5042,7 +5042,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
50425042
}
50435043
}
50445044

5045-
int try_release_extent_buffer(struct page *page, gfp_t mask)
5045+
int try_release_extent_buffer(struct page *page)
50465046
{
50475047
struct extent_buffer *eb;
50485048

@@ -5072,9 +5072,6 @@ int try_release_extent_buffer(struct page *page, gfp_t mask)
50725072
}
50735073
spin_unlock(&page->mapping->private_lock);
50745074

5075-
if ((mask & GFP_NOFS) == GFP_NOFS)
5076-
mask = GFP_NOFS;
5077-
50785075
/*
50795076
* If tree ref isn't set then we know the ref on this eb is a real ref,
50805077
* so just return, this page will likely be freed soon anyway.
@@ -5084,5 +5081,5 @@ int try_release_extent_buffer(struct page *page, gfp_t mask)
50845081
return 0;
50855082
}
50865083

5087-
return release_extent_buffer(eb, mask);
5084+
return release_extent_buffer(eb);
50885085
}

fs/btrfs/extent_io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void extent_io_tree_init(struct extent_io_tree *tree,
189189
int try_release_extent_mapping(struct extent_map_tree *map,
190190
struct extent_io_tree *tree, struct page *page,
191191
gfp_t mask);
192-
int try_release_extent_buffer(struct page *page, gfp_t mask);
192+
int try_release_extent_buffer(struct page *page);
193193
int lock_extent(struct extent_io_tree *tree, u64 start, u64 end);
194194
int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
195195
int bits, struct extent_state **cached);

0 commit comments

Comments
 (0)