| Message ID | 7a0532b77dd6f3571da6b17228bb19501e9b3f26.1684967923.git.dsterba@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Parameter cleanups in extent state helpers | expand |
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
On 2023/5/25 07:04, David Sterba wrote: > The helper is used once in fs code and a few times in the self test > code. > > Signed-off-by: David Sterba <dsterba@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/extent-io-tree.h | 9 --------- > fs/btrfs/inode.c | 4 ++-- > fs/btrfs/tests/extent-io-tests.c | 6 +++--- > 3 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h > index ea344e5ca24f..e5289d67b6b7 100644 > --- a/fs/btrfs/extent-io-tree.h > +++ b/fs/btrfs/extent-io-tree.h > @@ -193,15 +193,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, > u32 bits, u32 clear_bits, > struct extent_state **cached_state); > > -static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start, > - u64 end, u32 extra_bits, > - struct extent_state **cached_state) > -{ > - return set_extent_bit(tree, start, end, > - EXTENT_DELALLOC | extra_bits, > - cached_state, GFP_NOFS); > -} > - > static inline int set_extent_new(struct extent_io_tree *tree, u64 start, > u64 end) > { > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 2e83fb225052..6144a2b89db2 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -2922,8 +2922,8 @@ int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end, > return ret; > } > > - return set_extent_delalloc(&inode->io_tree, start, end, extra_bits, > - cached_state); > + return set_extent_bit(&inode->io_tree, start, end, > + EXTENT_DELALLOC | extra_bits, cached_state, GFP_NOFS); > } > > /* see btrfs_writepage_start_hook for details on why this is required */ > diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c > index dfc5c7fa6038..b9de94a50868 100644 > --- a/fs/btrfs/tests/extent-io-tests.c > +++ b/fs/btrfs/tests/extent-io-tests.c > @@ -159,7 +159,7 @@ static int test_find_delalloc(u32 sectorsize) > * |--- delalloc ---| > * |--- search ---| > */ > - set_extent_delalloc(tmp, 0, sectorsize - 1, 0, NULL); > + set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); > start = 0; > end = start + PAGE_SIZE - 1; > found = find_lock_delalloc_range(inode, locked_page, &start, > @@ -190,7 +190,7 @@ static int test_find_delalloc(u32 sectorsize) > test_err("couldn't find the locked page"); > goto out_bits; > } > - set_extent_delalloc(tmp, sectorsize, max_bytes - 1, 0, NULL); > + set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); > start = test_start; > end = start + PAGE_SIZE - 1; > found = find_lock_delalloc_range(inode, locked_page, &start, > @@ -245,7 +245,7 @@ static int test_find_delalloc(u32 sectorsize) > * > * We are re-using our test_start from above since it works out well. > */ > - set_extent_delalloc(tmp, max_bytes, total_dirty - 1, 0, NULL); > + set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); > start = test_start; > end = start + PAGE_SIZE - 1; > found = find_lock_delalloc_range(inode, locked_page, &start,
diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h index ea344e5ca24f..e5289d67b6b7 100644 --- a/fs/btrfs/extent-io-tree.h +++ b/fs/btrfs/extent-io-tree.h @@ -193,15 +193,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bits, u32 clear_bits, struct extent_state **cached_state); -static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start, - u64 end, u32 extra_bits, - struct extent_state **cached_state) -{ - return set_extent_bit(tree, start, end, - EXTENT_DELALLOC | extra_bits, - cached_state, GFP_NOFS); -} - static inline int set_extent_new(struct extent_io_tree *tree, u64 start, u64 end) { diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2e83fb225052..6144a2b89db2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2922,8 +2922,8 @@ int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end, return ret; } - return set_extent_delalloc(&inode->io_tree, start, end, extra_bits, - cached_state); + return set_extent_bit(&inode->io_tree, start, end, + EXTENT_DELALLOC | extra_bits, cached_state, GFP_NOFS); } /* see btrfs_writepage_start_hook for details on why this is required */ diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c index dfc5c7fa6038..b9de94a50868 100644 --- a/fs/btrfs/tests/extent-io-tests.c +++ b/fs/btrfs/tests/extent-io-tests.c @@ -159,7 +159,7 @@ static int test_find_delalloc(u32 sectorsize) * |--- delalloc ---| * |--- search ---| */ - set_extent_delalloc(tmp, 0, sectorsize - 1, 0, NULL); + set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); start = 0; end = start + PAGE_SIZE - 1; found = find_lock_delalloc_range(inode, locked_page, &start, @@ -190,7 +190,7 @@ static int test_find_delalloc(u32 sectorsize) test_err("couldn't find the locked page"); goto out_bits; } - set_extent_delalloc(tmp, sectorsize, max_bytes - 1, 0, NULL); + set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); start = test_start; end = start + PAGE_SIZE - 1; found = find_lock_delalloc_range(inode, locked_page, &start, @@ -245,7 +245,7 @@ static int test_find_delalloc(u32 sectorsize) * * We are re-using our test_start from above since it works out well. */ - set_extent_delalloc(tmp, max_bytes, total_dirty - 1, 0, NULL); + set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL, GFP_NOFS); start = test_start; end = start + PAGE_SIZE - 1; found = find_lock_delalloc_range(inode, locked_page, &start,
The helper is used once in fs code and a few times in the self test code. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/extent-io-tree.h | 9 --------- fs/btrfs/inode.c | 4 ++-- fs/btrfs/tests/extent-io-tests.c | 6 +++--- 3 files changed, 5 insertions(+), 14 deletions(-)