bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: drop extent_changeset from set_extent_bit

Browse source 
The only places that set extent_changeset is set_record_extent_bits,
everywhere else sets it to NULL.  Drop this argument from
set_extent_bit.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2022-09-09 17:53:42 -04:00 • committed by David Sterba
parent 994bcd1eae
commit 291bbb1e7e
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/btrfs/extent-io-tree.c
View file

@ -1170,11 +1170,10 @@ out:
} }
int set_extent_bit(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, u32 bits, struct extent_state **cached_state, gfp_t mask)
struct extent_changeset *changeset)
{ {
return __set_extent_bit(tree, start, end, bits, NULL, cached_state, return __set_extent_bit(tree, start, end, bits, NULL, cached_state,
changeset, mask); NULL, mask);
} }
/* /*

18
fs/btrfs/extent-io-tree.h
View file

@ -160,19 +160,18 @@ 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, int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
u32 bits, struct extent_changeset *changeset); u32 bits, struct extent_changeset *changeset);
int set_extent_bit(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, u32 bits, struct extent_state **cached_state, gfp_t mask);
struct extent_changeset *changeset);
static inline int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start, static inline int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start,
u64 end, u32 bits) u64 end, u32 bits)
{ {
return set_extent_bit(tree, start, end, bits, NULL, GFP_NOWAIT, NULL); return set_extent_bit(tree, start, end, bits, NULL, GFP_NOWAIT);
} }
static inline int set_extent_bits(struct extent_io_tree *tree, u64 start, static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
u64 end, u32 bits) u64 end, u32 bits)
{ {
return set_extent_bit(tree, start, end, bits, NULL, GFP_NOFS, NULL); return set_extent_bit(tree, start, end, bits, NULL, GFP_NOFS);
} }
static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start, static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
@ -185,7 +184,7 @@ static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start, static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start,
u64 end, gfp_t mask) u64 end, gfp_t mask)
{ {
return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask, NULL); return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask);
} }
static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start, static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
@ -206,7 +205,7 @@ static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start,
{ {
return set_extent_bit(tree, start, end, return set_extent_bit(tree, start, end,
EXTENT_DELALLOC | extra_bits, EXTENT_DELALLOC | extra_bits,
cached_state, GFP_NOFS, NULL); cached_state, GFP_NOFS);
} }
static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start,
@ -214,21 +213,20 @@ static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start,
{ {
return set_extent_bit(tree, start, end, return set_extent_bit(tree, start, end,
EXTENT_DELALLOC | EXTENT_DEFRAG, EXTENT_DELALLOC | EXTENT_DEFRAG,
cached_state, GFP_NOFS, NULL); cached_state, GFP_NOFS);
} }
static inline int set_extent_new(struct extent_io_tree *tree, u64 start, static inline int set_extent_new(struct extent_io_tree *tree, u64 start,
u64 end) u64 end)
{ {
return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, GFP_NOFS, return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, GFP_NOFS);
NULL);
} }
static inline int set_extent_uptodate(struct extent_io_tree *tree, u64 start, static inline int set_extent_uptodate(struct extent_io_tree *tree, u64 start,
u64 end, struct extent_state **cached_state, gfp_t mask) u64 end, struct extent_state **cached_state, gfp_t mask)
{ {
return set_extent_bit(tree, start, end, EXTENT_UPTODATE, return set_extent_bit(tree, start, end, EXTENT_UPTODATE,
cached_state, mask, NULL); cached_state, mask);
} }
int find_first_extent_bit(struct extent_io_tree *tree, u64 start, int find_first_extent_bit(struct extent_io_tree *tree, u64 start,

4
fs/btrfs/inode.c
View file

@ -2816,7 +2816,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,
ret = set_extent_bit(&inode->io_tree, search_start, ret = set_extent_bit(&inode->io_tree, search_start,
search_start + em_len - 1, search_start + em_len - 1,
EXTENT_DELALLOC_NEW, cached_state, EXTENT_DELALLOC_NEW, cached_state,
GFP_NOFS, NULL); GFP_NOFS);
next: next:
search_start = extent_map_end(em); search_start = extent_map_end(em);
free_extent_map(em); free_extent_map(em);
@ -4962,7 +4962,7 @@ again:
if (only_release_metadata) if (only_release_metadata)
set_extent_bit(&inode->io_tree, block_start, block_end, set_extent_bit(&inode->io_tree, block_start, block_end,
EXTENT_NORESERVE, NULL, GFP_NOFS, NULL); EXTENT_NORESERVE, NULL, GFP_NOFS);
out_unlock: out_unlock:
if (ret) { if (ret) {