btrfs: Remove delalloc_end argument from extent_clear_unlock_delalloc
PATCH 1/2 btrfs: Remove delalloc_end argument from extent_clear_unlock_delalloc
It was added in ba8b04c1d4ad ("btrfs: extend btrfs_set_extent_delalloc and its friends to support in-band dedupe and subpage size patchset") as a preparatory patch for in-band and subapge block size patchsets. However neither of those are likely to be merged anytime soon and the code has diverged significantly from the last public post of either of those patchsets.
It's unlikely either of the patchests are going to use those preparatory steps so just remove the variables. Since cow_file_range also took delalloc_end to pass it to extent_clear_unlock_delalloc remove the parameter from that function as well.
Signed-off-by Nikolay Borisov <[email protected]>
--- fs/btrfs/extent_io.c | 6 +++--- fs/btrfs/extent_io.h | 6 +++--- fs/btrfs/inode.c | 48 ++++++++++++++++++-------------------------- 3 files changed, 25 insertions(+), 35 deletions(-)
fs/btrfs/extent_io.c +3 -3
@@ -1938,9 +1938,9 @@ static int __process_pages_contig(struct address_space *mapping, }void extent_clear_unlock_delalloc (struct inode *inode,u64 start,u64 end, -u64 delalloc_end,struct page *locked_page, -unsigned clear_bits, -unsigned long page_ops) +struct page *locked_page, +unsigned clear_bits, +unsigned long page_ops) {clear_extent_bit (&BTRFS_I (inode)->io_tree, start, end, clear_bits,1 ,0 ,NULL );
fs/btrfs/extent_io.h +3 -3
@@ -495,9 +495,9 @@ int map_private_extent_buffer(const struct extent_buffer *eb,void extent_range_clear_dirty_for_io (struct inode *inode,u64 start,u64 end);void extent_range_redirty_for_io (struct inode *inode,u64 start,u64 end);void extent_clear_unlock_delalloc (struct inode *inode,u64 start,u64 end, -u64 delalloc_end,struct page *locked_page, -unsigned bits_to_clear, -unsigned long page_ops); +struct page *locked_page, +unsigned bits_to_clear, +unsigned long page_ops);struct bio *btrfs_bio_alloc (u64 first_byte);struct bio *btrfs_io_bio_alloc (unsigned int nr_iovecs);struct bio *btrfs_bio_clone (struct bio *bio);
fs/btrfs/inode.c +19 -29
156 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/2 btrfs: Remove leftover of in-band dedupe
It's unlikely in-band dedupe is going to land so just remove any leftovers - dedupe.h header as well as the 'dedupe' parameter to btrfs_set_extent_delalloc.
Signed-off-by Nikolay Borisov <[email protected]>
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/dedupe.h | 12 ------------ fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 25 ++++++++++--------------- fs/btrfs/relocation.c | 2 +- fs/btrfs/tests/inode-tests.c | 12 ++++++------ 6 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 fs/btrfs/dedupe.h
fs/btrfs/ctree.h +1 -1
@@ -3147,7 +3147,7 @@ int btrfs_start_delalloc_snapshot(struct btrfs_root *root);int btrfs_start_delalloc_roots (struct btrfs_fs_info *fs_info,int nr);int btrfs_set_extent_delalloc (struct inode *inode,u64 start,u64 end,unsigned int extra_bits, -struct extent_state **cached_state,int dedupe); +struct extent_state **cached_state); int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, struct btrfs_root *new_root, struct btrfs_root *parent_root,
fs/btrfs/dedupe.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2016 Fujitsu. All rights reserved. -*/ - -#ifndef BTRFS_DEDUPE_H -#define BTRFS_DEDUPE_H - -/* later in-band dedupe will expand this struct */ -struct btrfs_dedupe_hash ; - -#endif
fs/btrfs/file.c +1 -1
@@ -559,7 +559,7 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages, } err =btrfs_set_extent_delalloc (inode, start_pos, end_of_last_block, - extra_bits, cached,0 ); + extra_bits, cached);if (err)return err;
fs/btrfs/inode.c +10 -15
@@ -46,7 +46,6 @@#include "backref.h" #include "props.h" #include "qgroup.h" -#include "dedupe.h" #include "delalloc-space.h" struct btrfs_iget_args {
@@ -81,8 +80,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent); static noinline int cow_file_range(struct inode *inode,struct page *locked_page,u64 start,u64 end,int *page_started, -unsigned long *nr_written,int unlock, -struct btrfs_dedupe_hash *hash); +unsigned long *nr_written,int unlock); static struct extent_map *create_io_em(struct inode *inode, u64 start, u64 len, u64 orig_start, u64 block_start, u64 block_len, u64 orig_block_len,
@@ -741,8 +739,7 @@ static noinline void submit_compressed_extents(struct async_chunk *async_chunk) async_extent->start, async_extent->start + async_extent->ram_size -1 , - &page_started, &nr_written,0 , - NULL); + &page_started, &nr_written, 0);/* JDM XXX */
@@ -927,8 +924,7 @@ static u64 get_extent_allocation_hint(struct inode *inode, u64 start, static noinline int cow_file_range(struct inode *inode,struct page *locked_page,u64 start,u64 end,int *page_started, -unsigned long *nr_written,int unlock, -struct btrfs_dedupe_hash *hash) +unsigned long *nr_written,int unlock) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_root *root =BTRFS_I (inode)->root;
@@ -1485,8 +1481,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,if (cow_start != (u64)-1 ) { ret =cow_file_range (inode, locked_page, cow_start, found_key.offset -1 , - page_started, nr_written,1 , -NULL ); + page_started, nr_written,1 );if (ret) {if (nocow) btrfs_dec_nocow_writers(fs_info,
@@ -1565,7 +1560,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,if (cow_start != (u64)-1 ) { cur_offset = end; ret =cow_file_range (inode, locked_page, cow_start, end, - page_started, nr_written,1 ,NULL ); + page_started, nr_written,1 );if (ret) goto error; }
@@ -1623,7 +1618,7 @@ int btrfs_run_delalloc_range(struct inode *inode, struct page *locked_page, page_started, 0, nr_written); }else if (!inode_need_compress (inode, start, end)) { ret =cow_file_range (inode, locked_page, start, end, - page_started, nr_written,1 ,NULL ); + page_started, nr_written,1 ); }else {set_bit (BTRFS_INODE_HAS_ASYNC_EXTENT , &BTRFS_I (inode)->runtime_flags);
@@ -2058,7 +2053,7 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans,int btrfs_set_extent_delalloc (struct inode *inode,u64 start,u64 end,unsigned int extra_bits, -struct extent_state **cached_state,int dedupe) +struct extent_state **cached_state) {WARN_ON (PAGE_ALIGNED (end)); return set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end,
@@ -2124,7 +2119,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) } ret =btrfs_set_extent_delalloc (inode, page_start, page_end,0 , - &cached_state,0 ); + &cached_state);if (ret) {mapping_set_error (page->mapping, ret);end_extent_writepage (page, ret, page_start, page_end);
@@ -4919,7 +4914,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 0, 0, &cached_state); ret =btrfs_set_extent_delalloc (inode, block_start, block_end,0 , - &cached_state,0 ); + &cached_state);if (ret) {unlock_extent_cached (io_tree, block_start, block_end, &cached_state);
@@ -9004,7 +8999,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 0, 0, &cached_state); ret2 =btrfs_set_extent_delalloc (inode, page_start, end,0 , - &cached_state,0 ); + &cached_state);if (ret2) {unlock_extent_cached (io_tree, page_start, page_end, &cached_state);
fs/btrfs/relocation.c +1 -1
@@ -3311,7 +3311,7 @@ static int relocate_file_extent_cluster(struct inode *inode, } ret =btrfs_set_extent_delalloc (inode, page_start, page_end,0 , -NULL ,0 ); +NULL );if (ret) {unlock_page (page);put_page (page);
fs/btrfs/tests/inode-tests.c +6 -6
@@ -957,7 +957,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)/* [BTRFS_MAX_EXTENT_SIZE] */ ret =btrfs_set_extent_delalloc (inode,0 ,BTRFS_MAX_EXTENT_SIZE -1 ,0 , -NULL ,0 ); +NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
@@ -972,7 +972,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)/* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */ ret =btrfs_set_extent_delalloc (inode,BTRFS_MAX_EXTENT_SIZE ,BTRFS_MAX_EXTENT_SIZE + sectorsize -1 , -0 ,NULL ,0 ); +0 ,NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
@@ -1005,7 +1005,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) ret =btrfs_set_extent_delalloc (inode,BTRFS_MAX_EXTENT_SIZE >>1 , (BTRFS_MAX_EXTENT_SIZE >>1 ) + sectorsize -1 , -0 ,NULL ,0 ); +0 ,NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
@@ -1023,7 +1023,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) ret =btrfs_set_extent_delalloc (inode,BTRFS_MAX_EXTENT_SIZE +2 * sectorsize, (BTRFS_MAX_EXTENT_SIZE <<1 ) +3 * sectorsize -1 , -0 ,NULL ,0 ); +0 ,NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
@@ -1040,7 +1040,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)*/ ret =btrfs_set_extent_delalloc (inode,BTRFS_MAX_EXTENT_SIZE + sectorsize, -BTRFS_MAX_EXTENT_SIZE +2 * sectorsize -1 ,0 ,NULL ,0 ); +BTRFS_MAX_EXTENT_SIZE +2 * sectorsize -1 ,0 ,NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
@@ -1075,7 +1075,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)*/ ret =btrfs_set_extent_delalloc (inode,BTRFS_MAX_EXTENT_SIZE + sectorsize, -BTRFS_MAX_EXTENT_SIZE +2 * sectorsize -1 ,0 ,NULL ,0 ); +BTRFS_MAX_EXTENT_SIZE +2 * sectorsize -1 ,0 ,NULL );if (ret) {test_err ("btrfs_set_extent_delalloc returned %d" , ret); goto out;
Signature · 1 line
2.17.1
Quoted 6 lines · Nikolay Borisov
It was added in
ba8b04c1d4ad("btrfs: extendbtrfs_set_extent_delallocand its friends to support in-band dedupe and subpage size patchset") as a preparatory patch for in-band and subapge block size patchsets. However neither of those are likely to be merged anytime soon and the code has diverged significantly from the last public post of either of those patchsets.
Yeah, keeping the parameter in place for the patchsets has become indefensible.