btrfs: miscellaneous cleanups
Subsystems (2)
cover btrfs: miscellaneous cleanups
From: Omar Sandoval <[email protected]>
Hi,
This series includes several cleanups. Patches 1-3 are the standalone cleanups from my RWF_ENCODED series [1] (as requested by Dave). Patches 4-8 clean up code rot in the writepage codepath. Patch 9 is a trivial cleanup in find_free_extent.
Based on misc-next.
Thanks!
1: https://lore.kernel.org/linux-btrfs/[email protected]/
Omar Sandoval (9):
btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
btrfs: remove dead snapshot-aware defrag code
btrfs: make btrfs_ordered_extent naming consistent with
btrfs_file_extent_item
btrfs: remove unnecessary pg_offset assignments in
__extent_writepage()
btrfs: remove trivial goto label in __extent_writepage()
btrfs: remove redundant i_size check in __extent_writepage_io()
btrfs: drop create parameter to btrfs_get_extent()
btrfs: simplify compressed/inline check in __extent_writepage_io()
btrfs: remove struct find_free_extent.ram_bytes
fs/btrfs/compression.c | 4 +- fs/btrfs/ctree.h | 6 +- fs/btrfs/disk-io.c | 4 +- fs/btrfs/disk-io.h | 4 +- fs/btrfs/extent-tree.c | 2 - fs/btrfs/extent_io.c | 42 +- fs/btrfs/extent_io.h | 6 +- fs/btrfs/file-item.c | 39 +- fs/btrfs/file.c | 23 +- fs/btrfs/inode.c | 801 +++-------------------------------- fs/btrfs/ioctl.c | 2 +- fs/btrfs/ordered-data.c | 69 ++- fs/btrfs/ordered-data.h | 26 +- fs/btrfs/relocation.c | 5 +- include/trace/events/btrfs.h | 6 +- 15 files changed, 171 insertions(+), 868 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/9 btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
From: Omar Sandoval <[email protected]>
Currently, we have two wrappers for __btrfs_lookup_bio_sums():btrfs_lookup_bio_sums_dio(), which is used for direct I/O, and btrfs_lookup_bio_sums(), which is used everywhere else. The only difference is that the _dio variant looks up csums starting at the given offset instead of using the page index, which isn't actually direct I/O-specific. Let's clean up the signature and return value of __btrfs_lookup_bio_sums(), rename it to btrfs_lookup_bio_sums(), and get rid of the trivial helpers.
--- fs/btrfs/compression.c | 4 ++-- fs/btrfs/ctree.h | 4 +--- fs/btrfs/file-item.c | 35 +++++++++++++++++------------------ fs/btrfs/inode.c | 6 +++--- 4 files changed, 23 insertions(+), 26 deletions(-)
fs/btrfs/compression.c +2 -2
@@ -758,7 +758,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,if (!(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { ret =btrfs_lookup_bio_sums (inode, comp_bio, - sums); + false,0 , sums);BUG_ON (ret);/* -ENOMEM */ }
@@ -786,7 +786,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,BUG_ON (ret);/* -ENOMEM */ if (!(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { - ret =btrfs_lookup_bio_sums (inode, comp_bio, sums); + ret =btrfs_lookup_bio_sums (inode, comp_bio, false,0 , sums);BUG_ON (ret);/* -ENOMEM */ }
fs/btrfs/ctree.h +1 -3
@@ -2789,9 +2789,7 @@ struct btrfs_dio_private;int btrfs_del_csums (struct btrfs_trans_handle *trans,struct btrfs_fs_info *fs_info,u64 bytenr,u64 len);blk_status_t btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, -u8 *dst); -blk_status_t btrfs_lookup_bio_sums_dio (struct inode *inode,struct bio *bio, -u64 logical_offset); +bool at_offset,u64 offset,u8 *dst); int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid, u64 pos,
fs/btrfs/file-item.c +17 -18
@@ -148,8 +148,21 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,return ret; } -static blk_status_t __btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, -u64 logical_offset,u8 *dst,int dio) +/** +* btrfs_lookup_bio_sums - Look up checksums for a bio. +* @inode: inode that the bio is for. +* @bio: bio embedded in btrfs_io_bio. +* @at_offset: If true, look up checksums for the extent at @offset. +* If false, use the page offsets from the bio. +* @offset: If @at_offset is true, offset in file to look up checksums for. +* Ignored otherwise. +* @dst: Buffer of size btrfs_super_csum_size() used to return checksum. If +* NULL, the checksum is returned in btrfs_io_bio(bio)->csum instead. +* +* Return: BLK_STS_RESOURCE if allocating memory fails, BLK_STS_OK otherwise. +*/ +blk_status_t btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, +bool at_offset,u64 offset,u8 *dst) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct bio_vec bvec;
@@ -159,7 +172,6 @@ static blk_status_t __btrfs_lookup_bio_sums(struct inode *inode, struct bio *biostruct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree;struct btrfs_path *path;u8 *csum; -u64 offset =0 ;u64 item_start_offset =0 ;u64 item_last_offset =0 ;u64 disk_bytenr;
@@ -205,15 +217,13 @@ static blk_status_t __btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio } disk_bytenr = (u64 )bio->bi_iter.bi_sector <<9 ; -if (dio) - offset = logical_offset;bio_for_each_segment (bvec, bio, iter) { page_bytes_left = bvec.bv_len;if (count) goto next; -if (!dio) +if (!at_offset) offset =page_offset (bvec.bv_page) + bvec.bv_offset; count =btrfs_find_ordered_sum (inode, offset, disk_bytenr, csum, nblocks);
@@ -285,18 +295,7 @@ static blk_status_t __btrfs_lookup_bio_sums(struct inode *inode, struct bio *bioWARN_ON_ONCE (count);btrfs_free_path (path); -return 0 ; -} - -blk_status_t btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, -u8 *dst) -{ -return __btrfs_lookup_bio_sums (inode, bio,0 , dst,0 ); -} - -blk_status_t btrfs_lookup_bio_sums_dio (struct inode *inode,struct bio *bio,u64 offset) -{ -return __btrfs_lookup_bio_sums (inode, bio, offset,NULL ,1 ); +return BLK_STS_OK ; } int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
fs/btrfs/inode.c +3 -3
@@ -2128,7 +2128,7 @@ static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio, bio_flags); goto out; }else if (!skip_sum) { - ret =btrfs_lookup_bio_sums (inode, bio,NULL ); + ret =btrfs_lookup_bio_sums (inode, bio, false,0 ,NULL );if (ret) goto out; }
@@ -8356,8 +8356,8 @@ static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode,* contention. */ if (dip->logical_offset == file_offset) { - ret =btrfs_lookup_bio_sums_dio (inode, dip->orig_bio, - file_offset); + ret =btrfs_lookup_bio_sums (inode, dip->orig_bio, true, + file_offset,NULL );if (ret)return ret; }
Signature · 1 line
2.24.0
PATCH 2/9 btrfs: remove dead snapshot-aware defrag code
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Snapshot-aware defrag has been disabled since commit 8101c8dbf624 ("Btrfs: disable snapshot aware defrag for now") almost 6 years ago. Let's remove the dead code. If someone is up to the task of bringing it back, they can dig it up from git.
This is logically a revert of commit 38c227d87c49 ("Btrfs:
snapshot-aware defrag") except that now we have to clear the EXTENT_DEFRAG bit to avoid need_force_cow() returning true forever.
--- fs/btrfs/inode.c | 695 +---------------------------------------------- 1 file changed, 11 insertions(+), 684 deletions(-)
fs/btrfs/inode.c +11 -684
@@ -44,7 +44,6 @@#include "locking.h" #include "free-space-cache.h" #include "inode-map.h" -#include "backref.h" #include "props.h" #include "qgroup.h" #include "delalloc-space.h"
@@ -2394,649 +2393,6 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,return ret; } -/* snapshot-aware defrag */ -struct sa_defrag_extent_backref { -struct rb_node node; -struct old_sa_defrag_extent *old; -u64 root_id; -u64 inum; -u64 file_pos; -u64 extent_offset; -u64 num_bytes; -u64 generation; -}; - -struct old_sa_defrag_extent { -struct list_head list; -struct new_sa_defrag_extent *new; - -u64 extent_offset; -u64 bytenr; -u64 offset; -u64 len; -int count; -}; - -struct new_sa_defrag_extent { -struct rb_root root; -struct list_head head; -struct btrfs_path *path; -struct inode *inode; -u64 file_pos; -u64 len; -u64 bytenr; -u64 disk_len; -u8 compress_type; -}; - -static int backref_comp (struct sa_defrag_extent_backref *b1, -struct sa_defrag_extent_backref *b2) -{ -if (b1->root_id < b2->root_id) -return -1 ; -else if (b1->root_id > b2->root_id) -return 1 ; - -if (b1->inum < b2->inum) -return -1 ; -else if (b1->inum > b2->inum) -return 1 ; - -if (b1->file_pos < b2->file_pos) -return -1 ; -else if (b1->file_pos > b2->file_pos) -return 1 ; - -/* -* [------------------------------] ===> (a range of space) -* |<--->| |<---->| =============> (fs/file tree A) -* |<---------------------------->| ===> (fs/file tree B) -* -* A range of space can refer to two file extents in one tree while -* refer to only one file extent in another tree. -* -* So we may process a disk offset more than one time(two extents in A) -* and locate at the same extent(one extent in B), then insert two same -* backrefs(both refer to the extent in B). -*/ -return 0 ; -} - -static void backref_insert (struct rb_root *root, -struct sa_defrag_extent_backref *backref) -{ -struct rb_node **p = &root->rb_node; -struct rb_node *parent =NULL ; -struct sa_defrag_extent_backref *entry; -int ret; - -while (*p) { - parent = *p; - entry = rb_entry(parent, struct sa_defrag_extent_backref, node); - - ret =backref_comp (backref, entry); -if (ret <0 ) - p = &(*p)->rb_left; -else - p = &(*p)->rb_right; - } - -rb_link_node (&backref->node, parent, p); -rb_insert_color (&backref->node, root); -} - -/* -* Note the backref might has changed, and in this case we just return 0. -*/ -static noinline int record_one_backref(u64 inum, u64 offset, u64 root_id, -void *ctx) -{ -struct btrfs_file_extent_item *extent; -struct old_sa_defrag_extent *old = ctx; -struct new_sa_defrag_extent *new = old->new; -struct btrfs_path *path = new->path; -struct btrfs_key key; -struct btrfs_root *root; -struct sa_defrag_extent_backref *backref; -struct extent_buffer *leaf; -struct inode *inode = new->inode; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -int slot; -int ret; -u64 extent_offset; -u64 num_bytes; - -if (BTRFS_I (inode)->root->root_key.objectid == root_id && - inum ==btrfs_ino (BTRFS_I (inode))) -return 0 ; - - key.objectid = root_id; - key.type =BTRFS_ROOT_ITEM_KEY ; - key.offset = (u64)-1 ; - - root =btrfs_read_fs_root_no_name (fs_info, &key); -if (IS_ERR (root)) { -if (PTR_ERR (root) == -ENOENT ) -return 0 ; -WARN_ON (1 ); -btrfs_debug (fs_info,"inum=%llu, offset=%llu, root_id=%llu" , - inum, offset, root_id); -return PTR_ERR (root); - } - - key.objectid = inum; - key.type =BTRFS_EXTENT_DATA_KEY ; -if (offset > (u64)-1 <<32 ) - key.offset =0 ; -else - key.offset = offset; - - ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); -if (WARN_ON (ret <0 )) -return ret; - ret =0 ; - -while (1 ) { -cond_resched (); - - leaf = path->nodes[0 ]; - slot = path->slots[0 ]; - -if (slot >=btrfs_header_nritems (leaf)) { - ret =btrfs_next_leaf (root, path); -if (ret <0 ) { - goto out; - }else if (ret >0 ) { - ret =0 ; - goto out; - } -continue ; - } - - path->slots[0 ]++; - -btrfs_item_key_to_cpu (leaf, &key, slot); - -if (key.objectid > inum) - goto out; - -if (key.objectid < inum || key.type !=BTRFS_EXTENT_DATA_KEY ) -continue ; - - extent =btrfs_item_ptr (leaf, slot, - struct btrfs_file_extent_item); - -if (btrfs_file_extent_disk_bytenr (leaf, extent) != old->bytenr) -continue ; - -/* -* 'offset' refers to the exact key.offset, -* NOT the 'offset' field in btrfs_extent_data_ref, ie. -* (key.offset - extent_offset). -*/ -if (key.offset != offset) -continue ; - - extent_offset =btrfs_file_extent_offset (leaf, extent); - num_bytes =btrfs_file_extent_num_bytes (leaf, extent); - -if (extent_offset >= old->extent_offset + old->offset + - old->len || extent_offset + num_bytes <= - old->extent_offset + old->offset) -continue ; -break ; - } - - backref =kmalloc (sizeof (*backref),GFP_NOFS ); -if (!backref) { - ret = -ENOENT ; - goto out; - } - - backref->root_id = root_id; - backref->inum = inum; - backref->file_pos = offset; - backref->num_bytes = num_bytes; - backref->extent_offset = extent_offset; - backref->generation =btrfs_file_extent_generation (leaf, extent); - backref->old = old; -backref_insert (&new->root, backref); - old->count++; -out: -btrfs_release_path (path); -WARN_ON (ret); -return ret; -} - -static noinline bool record_extent_backrefs(struct btrfs_path *path, -struct new_sa_defrag_extent *new) -{ -struct btrfs_fs_info *fs_info =btrfs_sb (new->inode->i_sb); -struct old_sa_defrag_extent *old, *tmp; -int ret; - - new->path = path; - -list_for_each_entry_safe (old, tmp, &new->head, list) { - ret =iterate_inodes_from_logical (old->bytenr + - old->extent_offset, fs_info, - path, record_one_backref, - old, false); -if (ret <0 && ret != -ENOENT ) -return false; - -/* no backref to be processed for this extent */ -if (!old->count) { -list_del (&old->list); -kfree (old); - } - } - -if (list_empty (&new->head)) -return false; - -return true; -} - -static int relink_is_mergable (struct extent_buffer *leaf, -struct btrfs_file_extent_item *fi, -struct new_sa_defrag_extent *new) -{ -if (btrfs_file_extent_disk_bytenr (leaf, fi) != new->bytenr) -return 0 ; - -if (btrfs_file_extent_type (leaf, fi) !=BTRFS_FILE_EXTENT_REG ) -return 0 ; - -if (btrfs_file_extent_compression (leaf, fi) != new->compress_type) -return 0 ; - -if (btrfs_file_extent_encryption (leaf, fi) || -btrfs_file_extent_other_encoding (leaf, fi)) -return 0 ; - -return 1 ; -} - -/* -* Note the backref might has changed, and in this case we just return 0. -*/ -static noinline int relink_extent_backref(struct btrfs_path *path, -struct sa_defrag_extent_backref *prev, -struct sa_defrag_extent_backref *backref) -{ -struct btrfs_file_extent_item *extent; -struct btrfs_file_extent_item *item; -struct btrfs_ordered_extent *ordered; -struct btrfs_trans_handle *trans; -struct btrfs_ref ref = {0 }; -struct btrfs_root *root; -struct btrfs_key key; -struct extent_buffer *leaf; -struct old_sa_defrag_extent *old = backref->old; -struct new_sa_defrag_extent *new = old->new; -struct btrfs_fs_info *fs_info =btrfs_sb (new->inode->i_sb); -struct inode *inode; -struct extent_state *cached =NULL ; -int ret =0 ; -u64 start; -u64 len; -u64 lock_start; -u64 lock_end; -bool merge = false; -int index; - -if (prev && prev->root_id == backref->root_id && - prev->inum == backref->inum && - prev->file_pos + prev->num_bytes == backref->file_pos) - merge = true; - -/* step 1: get root */ - key.objectid = backref->root_id; - key.type =BTRFS_ROOT_ITEM_KEY ; - key.offset = (u64)-1 ; - - index =srcu_read_lock (&fs_info->subvol_srcu); - - root =btrfs_read_fs_root_no_name (fs_info, &key); -if (IS_ERR (root)) { -srcu_read_unlock (&fs_info->subvol_srcu, index); -if (PTR_ERR (root) == -ENOENT ) -return 0 ; -return PTR_ERR (root); - } - -if (btrfs_root_readonly (root)) { -srcu_read_unlock (&fs_info->subvol_srcu, index); -return 0 ; - } - -/* step 2: get inode */ - key.objectid = backref->inum; - key.type =BTRFS_INODE_ITEM_KEY ; - key.offset =0 ; - - inode =btrfs_iget (fs_info->sb, &key, root); -if (IS_ERR (inode)) { -srcu_read_unlock (&fs_info->subvol_srcu, index); -return 0 ; - } - -srcu_read_unlock (&fs_info->subvol_srcu, index); - -/* step 3: relink backref */ - lock_start = backref->file_pos; - lock_end = backref->file_pos + backref->num_bytes -1 ; -lock_extent_bits (&BTRFS_I (inode)->io_tree, lock_start, lock_end, - &cached); - - ordered =btrfs_lookup_first_ordered_extent (inode, lock_end); -if (ordered) { -btrfs_put_ordered_extent (ordered); - goto out_unlock; - } - - trans =btrfs_join_transaction (root); -if (IS_ERR (trans)) { - ret =PTR_ERR (trans); - goto out_unlock; - } - - key.objectid = backref->inum; - key.type =BTRFS_EXTENT_DATA_KEY ; - key.offset = backref->file_pos; - - ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); -if (ret <0 ) { - goto out_free_path; - }else if (ret >0 ) { - ret =0 ; - goto out_free_path; - } - - extent =btrfs_item_ptr (path->nodes[0 ], path->slots[0 ], - struct btrfs_file_extent_item); - -if (btrfs_file_extent_generation (path->nodes[0 ], extent) != - backref->generation) - goto out_free_path; - -btrfs_release_path (path); - - start = backref->file_pos; -if (backref->extent_offset < old->extent_offset + old->offset) - start += old->extent_offset + old->offset - - backref->extent_offset; - - len =min (backref->extent_offset + backref->num_bytes, - old->extent_offset + old->offset + old->len); - len -=max (backref->extent_offset, old->extent_offset + old->offset); - - ret =btrfs_drop_extents (trans, root, inode, start, - start + len,1 ); -if (ret) - goto out_free_path; -again: - key.objectid =btrfs_ino (BTRFS_I (inode)); - key.type =BTRFS_EXTENT_DATA_KEY ; - key.offset = start; - - path->leave_spinning =1 ; -if (merge) { -struct btrfs_file_extent_item *fi; -u64 extent_len; -struct btrfs_key found_key; - - ret =btrfs_search_slot (trans, root, &key, path,0 ,1 ); -if (ret <0 ) - goto out_free_path; - - path->slots[0 ]--; - leaf = path->nodes[0 ]; -btrfs_item_key_to_cpu (leaf, &found_key, path->slots[0 ]); - - fi =btrfs_item_ptr (leaf, path->slots[0 ], - struct btrfs_file_extent_item); - extent_len =btrfs_file_extent_num_bytes (leaf, fi); - -if (extent_len + found_key.offset == start && -relink_is_mergable (leaf, fi, new)) { -btrfs_set_file_extent_num_bytes (leaf, fi, - extent_len + len); -btrfs_mark_buffer_dirty (leaf); -inode_add_bytes (inode, len); - - ret =1 ; - goto out_free_path; - }else { - merge = false; -btrfs_release_path (path); - goto again; - } - } - - ret =btrfs_insert_empty_item (trans, root, path, &key, -sizeof (*extent)); -if (ret) { -btrfs_abort_transaction (trans, ret); - goto out_free_path; - } - - leaf = path->nodes[0 ]; - item =btrfs_item_ptr (leaf, path->slots[0 ], - struct btrfs_file_extent_item); -btrfs_set_file_extent_disk_bytenr (leaf, item, new->bytenr); -btrfs_set_file_extent_disk_num_bytes (leaf, item, new->disk_len); -btrfs_set_file_extent_offset (leaf, item, start - new->file_pos); -btrfs_set_file_extent_num_bytes (leaf, item, len); -btrfs_set_file_extent_ram_bytes (leaf, item, new->len); -btrfs_set_file_extent_generation (leaf, item, trans->transid); -btrfs_set_file_extent_type (leaf, item,BTRFS_FILE_EXTENT_REG ); -btrfs_set_file_extent_compression (leaf, item, new->compress_type); -btrfs_set_file_extent_encryption (leaf, item,0 ); -btrfs_set_file_extent_other_encoding (leaf, item,0 ); - -btrfs_mark_buffer_dirty (leaf); -inode_add_bytes (inode, len); -btrfs_release_path (path); - -btrfs_init_generic_ref (&ref,BTRFS_ADD_DELAYED_REF , new->bytenr, - new->disk_len,0 ); -btrfs_init_data_ref (&ref, backref->root_id, backref->inum, - new->file_pos);/* start - extent_offset */ - ret =btrfs_inc_extent_ref (trans, &ref); -if (ret) { -btrfs_abort_transaction (trans, ret); - goto out_free_path; - } - - ret =1 ; -out_free_path: -btrfs_release_path (path); - path->leave_spinning =0 ; -btrfs_end_transaction (trans); -out_unlock: -unlock_extent_cached (&BTRFS_I (inode)->io_tree, lock_start, lock_end, - &cached); -iput (inode); -return ret; -} - -static void free_sa_defrag_extent (struct new_sa_defrag_extent *new) -{ -struct old_sa_defrag_extent *old, *tmp; - -if (!new) -return ; - -list_for_each_entry_safe (old, tmp, &new->head, list) { -kfree (old); - } -kfree (new); -} - -static void relink_file_extents (struct new_sa_defrag_extent *new) -{ -struct btrfs_fs_info *fs_info =btrfs_sb (new->inode->i_sb); -struct btrfs_path *path; -struct sa_defrag_extent_backref *backref; -struct sa_defrag_extent_backref *prev =NULL ; -struct rb_node *node; -int ret; - - path =btrfs_alloc_path (); -if (!path) -return ; - -if (!record_extent_backrefs (path, new)) { -btrfs_free_path (path); - goto out; - } -btrfs_release_path (path); - -while (1 ) { - node =rb_first (&new->root); -if (!node) -break ; -rb_erase (node, &new->root); - - backref = rb_entry(node, struct sa_defrag_extent_backref, node); - - ret =relink_extent_backref (path, prev, backref); -WARN_ON (ret <0 ); - -kfree (prev); - -if (ret ==1 ) - prev = backref; -else - prev =NULL ; -cond_resched (); - } -kfree (prev); - -btrfs_free_path (path); -out: -free_sa_defrag_extent (new); - -atomic_dec (&fs_info->defrag_running); -wake_up (&fs_info->transaction_wait); -} - -static struct new_sa_defrag_extent * -record_old_file_extents (struct inode *inode, -struct btrfs_ordered_extent *ordered) -{ -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -struct btrfs_root *root =BTRFS_I (inode)->root; -struct btrfs_path *path; -struct btrfs_key key; -struct old_sa_defrag_extent *old; -struct new_sa_defrag_extent *new; -int ret; - - new =kmalloc (sizeof (*new),GFP_NOFS ); -if (!new) -return NULL ; - - new->inode = inode; - new->file_pos = ordered->file_offset; - new->len = ordered->len; - new->bytenr = ordered->start; - new->disk_len = ordered->disk_len; - new->compress_type = ordered->compress_type; - new->root =RB_ROOT ; -INIT_LIST_HEAD (&new->head); - - path =btrfs_alloc_path (); -if (!path) - goto out_kfree; - - key.objectid =btrfs_ino (BTRFS_I (inode)); - key.type =BTRFS_EXTENT_DATA_KEY ; - key.offset = new->file_pos; - - ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); -if (ret <0 ) - goto out_free_path; -if (ret >0 && path->slots[0 ] >0 ) - path->slots[0 ]--; - -/* find out all the old extents for the file range */ -while (1 ) { -struct btrfs_file_extent_item *extent; -struct extent_buffer *l; -int slot; -u64 num_bytes; -u64 offset; -u64 end; -u64 disk_bytenr; -u64 extent_offset; - - l = path->nodes[0 ]; - slot = path->slots[0 ]; - -if (slot >=btrfs_header_nritems (l)) { - ret =btrfs_next_leaf (root, path); -if (ret <0 ) - goto out_free_path; -else if (ret >0 ) -break ; -continue ; - } - -btrfs_item_key_to_cpu (l, &key, slot); - -if (key.objectid !=btrfs_ino (BTRFS_I (inode))) -break ; -if (key.type !=BTRFS_EXTENT_DATA_KEY ) -break ; -if (key.offset >= new->file_pos + new->len) -break ; - - extent = btrfs_item_ptr(l, slot, struct btrfs_file_extent_item); - - num_bytes =btrfs_file_extent_num_bytes (l, extent); -if (key.offset + num_bytes < new->file_pos) - goto next; - - disk_bytenr =btrfs_file_extent_disk_bytenr (l, extent); -if (!disk_bytenr) - goto next; - - extent_offset =btrfs_file_extent_offset (l, extent); - - old =kmalloc (sizeof (*old),GFP_NOFS ); -if (!old) - goto out_free_path; - - offset =max (new->file_pos, key.offset); - end =min (new->file_pos + new->len, key.offset + num_bytes); - - old->bytenr = disk_bytenr; - old->extent_offset = extent_offset; - old->offset = offset - key.offset; - old->len = end - offset; - old->new = new; - old->count =0 ; -list_add_tail (&old->list, &new->head); -next: - path->slots[0 ]++; -cond_resched (); - } - -btrfs_free_path (path); -atomic_inc (&fs_info->defrag_running); - -return new; - -out_free_path: -btrfs_free_path (path); -out_kfree: -free_sa_defrag_extent (new); -return NULL ; -} -static void btrfs_release_delalloc_bytes (struct btrfs_fs_info *fs_info,u64 start,u64 len) {
@@ -3064,7 +2420,6 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)struct btrfs_trans_handle *trans =NULL ;struct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree;struct extent_state *cached_state =NULL ; -struct new_sa_defrag_extent *new =NULL ;int compress_type =0 ;int ret =0 ;u64 logical_len = ordered_extent->len;
@@ -3073,6 +2428,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)bool range_locked = false;bool clear_new_delalloc_bytes = false;bool clear_reserved_extent = true; +unsigned int clear_bits; if (!test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) && !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags) &&
@@ -3131,20 +2487,6 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) ordered_extent->file_offset + ordered_extent->len -1 , &cached_state); - ret =test_range_bit (io_tree, ordered_extent->file_offset, - ordered_extent->file_offset + ordered_extent->len -1 , -EXTENT_DEFRAG ,0 , cached_state); -if (ret) { -u64 last_snapshot =btrfs_root_last_snapshot (&root->root_item); -if (0 && last_snapshot >=BTRFS_I (inode)->generation) -/* the inode is shared */ - new =record_old_file_extents (inode, ordered_extent); - -clear_extent_bit (io_tree, ordered_extent->file_offset, - ordered_extent->file_offset + ordered_extent->len -1 , -EXTENT_DEFRAG ,0 ,0 , &cached_state); - } -if (freespace_inode) trans =btrfs_join_transaction_spacecache (root);else
@@ -3205,21 +2547,16 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) } ret =0 ; out: -if (range_locked || clear_new_delalloc_bytes) { -unsigned int clear_bits =0 ; - -if (range_locked) - clear_bits |=EXTENT_LOCKED ; -if (clear_new_delalloc_bytes) - clear_bits |=EXTENT_DELALLOC_NEW ; -clear_extent_bit (&BTRFS_I (inode)->io_tree, - ordered_extent->file_offset, - ordered_extent->file_offset + - ordered_extent->len -1 , - clear_bits, - (clear_bits &EXTENT_LOCKED ) ?1 :0 , -0 , &cached_state); - } + clear_bits =EXTENT_DEFRAG ; +if (range_locked) + clear_bits |=EXTENT_LOCKED ; +if (clear_new_delalloc_bytes) + clear_bits |=EXTENT_DELALLOC_NEW ; +clear_extent_bit (&BTRFS_I (inode)->io_tree, + ordered_extent->file_offset, + ordered_extent->file_offset + ordered_extent->len -1 , + clear_bits, (clear_bits &EXTENT_LOCKED ) ?1 :0 ,0 , + &cached_state);if (trans)btrfs_end_transaction (trans);
@@ -3263,16 +2600,6 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)*/ btrfs_remove_ordered_extent (inode, ordered_extent); -/* for snapshot-aware defrag */ -if (new) { -if (ret) { -free_sa_defrag_extent (new); -atomic_dec (&fs_info->defrag_running); - }else { -relink_file_extents (new); - } - } -/* once for us */ btrfs_put_ordered_extent (ordered_extent);/* once for the tree */
Signature · 1 line
2.24.0
PATCH 3/9 btrfs: make btrfs_ordered_extent naming consistent with btrfs_file_extent_item
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
ordered->start, ordered->len, and ordered->disk_len correspond to fi->disk_bytenr, fi->num_bytes, and fi->disk_num_bytes, respectively. It's confusing to translate between the two naming schemes. Since a btrfs_ordered_extent is basically a pending btrfs_file_extent_item, let's make the former use the naming from the latter.
Note that I didn't touch the names in tracepoints just in case there are scripts depending on the current naming.
--- fs/btrfs/file-item.c | 4 +-- fs/btrfs/file.c | 6 ++-- fs/btrfs/inode.c | 67 ++++++++++++++++------------------ fs/btrfs/ordered-data.c | 69 ++++++++++++++++++------------------ fs/btrfs/ordered-data.h | 26 +++++++------- fs/btrfs/relocation.c | 5 +-- include/trace/events/btrfs.h | 6 ++-- 7 files changed, 90 insertions(+), 93 deletions(-)
fs/btrfs/file-item.c +2 -2
@@ -482,8 +482,8 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio, - 1);for (i =0 ; i < nr_sectors; i++) { -if (offset >= ordered->file_offset + ordered->len || - offset < ordered->file_offset) { +if (offset >= ordered->file_offset + ordered->num_bytes || + offset < ordered->file_offset) {unsigned long bytes_left; sums->len = this_sum_bytes;
fs/btrfs/file.c +3 -3
@@ -1501,7 +1501,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages, ordered =btrfs_lookup_ordered_range (inode, start_pos, last_pos - start_pos +1 );if (ordered && - ordered->file_offset + ordered->len > start_pos && + ordered->file_offset + ordered->num_bytes > start_pos && ordered->file_offset <= last_pos) {unlock_extent_cached (&inode->io_tree, start_pos, last_pos, cached_state);
@@ -2426,7 +2426,7 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,* we need to try again. */ if ((!ordered || - (ordered->file_offset + ordered->len <= lockstart || + (ordered->file_offset + ordered->num_bytes <= lockstart || ordered->file_offset > lockend)) && !filemap_range_has_page (inode->i_mapping, lockstart, lockend)) {
@@ -3248,7 +3248,7 @@ static long btrfs_fallocate(struct file *file, int mode, ordered =btrfs_lookup_first_ordered_extent (inode, locked_end);if (ordered && - ordered->file_offset + ordered->len > alloc_start && + ordered->file_offset + ordered->num_bytes > alloc_start && ordered->file_offset < alloc_end) {btrfs_put_ordered_extent (ordered); unlock_extent_cached(&BTRFS_I(inode)->io_tree,
fs/btrfs/inode.c +31 -36
156 lines not on this page · raw message
fs/btrfs/ordered-data.c +34 -35
160 lines not on this page · raw message
fs/btrfs/ordered-data.h +14 -12
@@ -67,14 +67,13 @@ struct btrfs_ordered_extent {/* logical offset in the file */ u64 file_offset; -/* disk byte number */ -u64 start; - -/* ram length of the extent in bytes */ -u64 len; - -/* extent length on disk */ -u64 disk_len; +/* +* These fields directly correspond to the same fields in +* btrfs_file_extent_item. +*/ +u64 disk_bytenr; +u64 num_bytes; +u64 disk_num_bytes;/* number of bytes that still need writing */ u64 bytes_left;
@@ -161,12 +160,15 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode, u64 *file_offset, u64 io_size, int uptodate);int btrfs_add_ordered_extent (struct inode *inode,u64 file_offset, -u64 start,u64 len,u64 disk_len,int type); +u64 disk_bytenr,u64 num_bytes,u64 disk_num_bytes, +int type);int btrfs_add_ordered_extent_dio (struct inode *inode,u64 file_offset, -u64 start,u64 len,u64 disk_len,int type); +u64 disk_bytenr,u64 num_bytes, +u64 disk_num_bytes,int type);int btrfs_add_ordered_extent_compress (struct inode *inode,u64 file_offset, -u64 start,u64 len,u64 disk_len, -int type,int compress_type); +u64 disk_bytenr,u64 num_bytes, +u64 disk_num_bytes,int type, +int compress_type);void btrfs_add_ordered_sum (struct btrfs_ordered_extent *entry,struct btrfs_ordered_sum *sum); struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,
fs/btrfs/relocation.c +3 -2
@@ -4614,7 +4614,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)LIST_HEAD (list); ordered =btrfs_lookup_ordered_extent (inode, file_pos); -BUG_ON (ordered->file_offset != file_pos || ordered->len != len); +BUG_ON (ordered->file_offset != file_pos || ordered->num_bytes != len); disk_bytenr = file_pos +BTRFS_I (inode)->index_cnt; ret = btrfs_lookup_csums_range(fs_info->csum_root, disk_bytenr,
@@ -4638,7 +4638,8 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)* disk_len vs real len like with real inodes since it's all * disk length. */ - new_bytenr = ordered->start + (sums->bytenr - disk_bytenr); + new_bytenr = (ordered->disk_bytenr + + (sums->bytenr - disk_bytenr)); sums->bytenr = new_bytenr;btrfs_add_ordered_sum (ordered, sums);
include/trace/events/btrfs.h +3 -3
@@ -496,9 +496,9 @@ DECLARE_EVENT_CLASS(btrfs__ordered_extent,TP_fast_assign_btrfs (btrfs_sb (inode->i_sb), __entry->ino = btrfs_ino(BTRFS_I(inode)); __entry->file_offset = ordered->file_offset; - __entry->start = ordered->start; - __entry->len = ordered->len; - __entry->disk_len = ordered->disk_len; + __entry->start = ordered->disk_bytenr; + __entry->len = ordered->num_bytes; + __entry->disk_len = ordered->disk_num_bytes; __entry->bytes_left = ordered->bytes_left; __entry->flags = ordered->flags; __entry->compress_type = ordered->compress_type;
Signature · 1 line
2.24.0
PATCH 4/9 btrfs: remove unnecessary pg_offset assignments in __extent_writepage()
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
We're initializing pg_offset to 0, setting it immediately, then reassigning it to 0 again after. The former became unnecessary in 211c17f51f46 ("Fix corners in writepage and btrfs_truncate_page"). The latter is a leftover that should've been removed in 40f765805f08 ("Btrfs: split up __extent_writepage to lower stack usage"). Remove both.
--- fs/btrfs/extent_io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/extent_io.c +1 -3
@@ -3562,7 +3562,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,u64 page_end = start +PAGE_SIZE -1 ;int ret;int nr =0 ; -size_t pg_offset =0 ; +size_t pg_offset;loff_t i_size =i_size_read (inode);unsigned long end_index = i_size >>PAGE_SHIFT ;unsigned long nr_written =0 ;
@@ -3591,8 +3591,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,flush_dcache_page (page); } - pg_offset =0 ; -set_page_extent_mapped (page);if (!epd->extent_locked) {
Signature · 1 line
2.24.0
PATCH 5/9 btrfs: remove trivial goto label in __extent_writepage()
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Since 40f765805f08 ("Btrfs: split up __extent_writepage to lower stack usage"), done_unlocked is simply a return 0. Get rid of it.
--- fs/btrfs/extent_io.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/btrfs/extent_io.c +2 -5
@@ -3596,7 +3596,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,if (!epd->extent_locked) { ret =writepage_delalloc (inode, page, wbc, start, &nr_written);if (ret ==1 ) - goto done_unlocked; +return 0 ;if (ret) goto done; }
@@ -3604,7 +3604,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, ret =__extent_writepage_io (inode, page, wbc, epd, i_size, nr_written, &nr);if (ret ==1 ) - goto done_unlocked; +return 0 ; done:if (nr ==0 ) {
@@ -3619,9 +3619,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,unlock_page (page);ASSERT (ret <=0 );return ret; - -done_unlocked: -return 0 ; }void wait_on_extent_buffer_writeback (struct extent_buffer *eb)
Signature · 1 line
2.24.0
PATCH 6/9 btrfs: remove redundant i_size check in __extent_writepage_io()
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
In __extent_writepage_io(), we check whetheri_size <= page_offset(page).
Note that if i_size < page_offset(page), theni_size >> PAGE_SHIFT < page->index. If i_size == page_offset(page), then i_size >> PAGE_SHIFT == page->index && offset_in_page(i_size) == 0.
__extent_writepage() already has a check for these cases that returns without calling __extent_writepage_io():
end_index = i_size >> PAGE_SHIFT
pg_offset = offset_in_page(i_size);
if (page->index > end_index ||
(page->index == end_index && !pg_offset)) {
page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);
unlock_page(page);
return 0;
}Get rid of the one in __extent_writepage_io(), which was obsoleted in 211c17f51f46 ("Fix corners in writepage and btrfs_truncate_page").
--- fs/btrfs/extent_io.c | 6 ------ 1 file changed, 6 deletions(-)
fs/btrfs/extent_io.c +0 -6
@@ -3455,11 +3455,6 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,update_nr_written (wbc, nr_written +1 ); end = page_end; -if (i_size <= start) { -btrfs_writepage_endio_finish_ordered (page, start, page_end,1 ); - goto done; - } - blocksize = inode->i_sb->s_blocksize;while (cur <= end) {
@@ -3540,7 +3535,6 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, pg_offset += iosize; nr++; } -done: *nr_ret = nr;return ret; }
Signature · 1 line
2.24.0
PATCH 7/9 btrfs: drop create parameter to btrfs_get_extent()
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
We only pass this as 1 from __extent_writepage_io(). The parameter basically means "pretend I didn't pass in a page". This is silly since we can simply not pass in the page. Get rid of the parameter from btrfs_get_extent(), and since it's used as a get_extent_t callback, remove it from get_extent_t and btree_get_extent(), neither of which need it.
While we're here, let's document btrfs_get_extent().
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/disk-io.h | 4 ++-- fs/btrfs/extent_io.c | 6 +++--- fs/btrfs/extent_io.h | 6 ++---- fs/btrfs/file.c | 17 ++++++++--------- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++----------------- fs/btrfs/ioctl.c | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-)
fs/btrfs/ctree.h +1 -1
@@ -2875,7 +2875,7 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, struct btrfs_root *root);struct extent_map *btrfs_get_extent (struct btrfs_inode *inode,struct page *page,size_t pg_offset, -u64 start,u64 end,int create); +u64 start,u64 end);int btrfs_update_inode (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct inode *inode);
fs/btrfs/disk-io.c +2 -2
@@ -202,8 +202,8 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb,* that covers the entire device */ struct extent_map *btree_get_extent (struct btrfs_inode *inode, -struct page *page,size_t pg_offset,u64 start,u64 len, -int create) +struct page *page,size_t pg_offset, +u64 start,u64 len) {struct extent_map_tree *em_tree = &inode->extent_tree;struct extent_map *em;
fs/btrfs/disk-io.h +2 -2
@@ -134,8 +134,8 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,int btree_lock_page_hook (struct page *page,void *data,void (*flush_fn)(void *));struct extent_map *btree_get_extent (struct btrfs_inode *inode, -struct page *page,size_t pg_offset,u64 start,u64 len, -int create); +struct page *page,size_t pg_offset, +u64 start,u64 len);int btrfs_get_num_tolerated_disk_barrier_failures (u64 flags);int __init btrfs_end_io_wq_init (void );void __cold btrfs_end_io_wq_exit (void );
fs/btrfs/extent_io.c +3 -3
@@ -3043,7 +3043,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset, *em_cached =NULL ; } - em =get_extent (BTRFS_I (inode), page, pg_offset, start, len,0 ); + em =get_extent (BTRFS_I (inode), page, pg_offset, start, len);if (em_cached && !IS_ERR_OR_NULL (em)) {BUG_ON (*em_cached);refcount_inc (&em->refs);
@@ -3466,8 +3466,8 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, page_end, 1);break ; } - em =btrfs_get_extent (BTRFS_I (inode), page, pg_offset, cur, - end - cur +1 ,1 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , cur, + end - cur +1 );if (IS_ERR_OR_NULL (em)) {SetPageError (page); ret =PTR_ERR_OR_ZERO (em);
fs/btrfs/extent_io.h +2 -4
@@ -183,10 +183,8 @@ static inline int extent_compress_type(unsigned long bio_flags)struct extent_map_tree ;typedef struct extent_map *(get_extent_t )(struct btrfs_inode *inode, -struct page *page, -size_t pg_offset, -u64 start,u64 len, -int create); +struct page *page,size_t pg_offset, +u64 start,u64 len);int try_release_extent_mapping (struct page *page,gfp_t mask);int try_release_extent_buffer (struct page *page);
fs/btrfs/file.c +8 -9
@@ -477,8 +477,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,u64 em_len;int ret =0 ; - em =btrfs_get_extent (inode,NULL ,0 , search_start, - search_len,0 ); + em =btrfs_get_extent (inode,NULL ,0 , search_start, search_len);if (IS_ERR (em))return PTR_ERR (em);
@@ -2390,7 +2389,7 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len) em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,round_down (*start, fs_info->sectorsize), -round_up (*len, fs_info->sectorsize),0 ); +round_up (*len, fs_info->sectorsize));if (IS_ERR (em))return PTR_ERR (em);
@@ -2957,7 +2956,7 @@ static int btrfs_zero_range_check_range_boundary(struct inode *inode,int ret; offset =round_down (offset, sectorsize); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em))return PTR_ERR (em);
@@ -2990,8 +2989,8 @@ static int btrfs_zero_range(struct inode *inode,inode_dio_wait (inode); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , - alloc_start, alloc_end - alloc_start,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , alloc_start, + alloc_end - alloc_start);if (IS_ERR (em)) { ret =PTR_ERR (em); goto out;
@@ -3034,8 +3033,8 @@ static int btrfs_zero_range(struct inode *inode,if (BTRFS_BYTES_TO_BLKS (fs_info, offset) ==BTRFS_BYTES_TO_BLKS (fs_info, offset + len -1 )) { - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , - alloc_start, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , alloc_start, + sectorsize);if (IS_ERR (em)) { ret =PTR_ERR (em); goto out;
@@ -3273,7 +3272,7 @@ static long btrfs_fallocate(struct file *file, int mode,INIT_LIST_HEAD (&reserve_list);while (cur_offset < alloc_end) { em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , cur_offset, - alloc_end - cur_offset,0 ); + alloc_end - cur_offset);if (IS_ERR (em)) { ret =PTR_ERR (em);break ;
fs/btrfs/inode.c +24 -17
92 lines not on this page · raw message
fs/btrfs/ioctl.c +1 -1
@@ -1122,7 +1122,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start)/* get the big lock and read metadata off disk */ lock_extent_bits (io_tree, start, end, &cached); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , start, len,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , start, len);unlock_extent_cached (io_tree, start, end, &cached);if (IS_ERR (em))
Signature · 1 line
2.24.0
PATCH 9/9 btrfs: remove struct find_free_extent.ram_bytes
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
This hasn't been used since it was first introduced in commit b4bd745d1230 ("btrfs: Introduce find_free_extent_ctl structure for later rework").
--- fs/btrfs/extent-tree.c | 2 -- 1 file changed, 2 deletions(-)
fs/btrfs/extent-tree.c +0 -2
@@ -3437,7 +3437,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,*/ struct find_free_extent_ctl {/* Basic allocation info */ -u64 ram_bytes;u64 num_bytes;u64 empty_size;u64 flags;
@@ -3809,7 +3808,6 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info,WARN_ON (num_bytes < fs_info->sectorsize); - ffe_ctl.ram_bytes = ram_bytes; ffe_ctl.num_bytes = num_bytes; ffe_ctl.empty_size = empty_size; ffe_ctl.flags = flags;
Signature · 1 line
2.24.0
PATCH 8/9 btrfs: simplify compressed/inline check in __extent_writepage_io()
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Commit 7087a9d8db88 ("btrfs: Remove extent_io_ops::writepage_end_io_hook") left this logic in a confusing state. Simplify it.
--- fs/btrfs/extent_io.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
fs/btrfs/extent_io.c +5 -14
@@ -3492,22 +3492,13 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,*/ if (compressed || block_start ==EXTENT_MAP_HOLE || block_start ==EXTENT_MAP_INLINE ) { -/* -* end_io notification does not happen here for -* compressed extents -*/ -if (!compressed) -btrfs_writepage_endio_finish_ordered (page, cur, - cur + iosize -1 , -1 ); -else if (compressed) { -/* we don't want to end_page_writeback on -* a compressed extent. this happens -* elsewhere -*/ +if (compressed) { nr++; + }else { +btrfs_writepage_endio_finish_ordered (page, cur, + cur + iosize -1 , +1 ); } - cur += iosize; pg_offset += iosize;continue ;
Signature · 1 line
2.24.0
Re: [PATCH 7/9] btrfs: drop create parameter to btrfs_get_extent()
In reply to Omar SandovalQuoted 12 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
We only pass this as 1 from
__extent_writepage_io(). The parameter basically means "pretend I didn't pass in a page". This is silly since we can simply not pass in the page. Get rid of the parameter frombtrfs_get_extent(), and since it's used as aget_extent_tcallback, remove it fromget_extent_tandbtree_get_extent(), neither of which need it.While we're here, let's document
btrfs_get_extent().Signed-off-by Omar Sandoval <[email protected]>
Quoted 10 lines
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/disk-io.h | 4 ++-- fs/btrfs/extent_io.c | 6 +++--- fs/btrfs/extent_io.h | 6 ++---- fs/btrfs/file.c | 17 ++++++++--------- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++----------------- fs/btrfs/ioctl.c | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-)
I missed the sanity tests. This needs the following folded in (which I can do if I have to resend this series):
fs/btrfs/tests/inode-tests.c +21 -22
@@ -263,7 +263,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)/* First with no extents */ BTRFS_I (inode)->root = root; - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 , sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 , sectorsize);if (IS_ERR (em)) { em =NULL ;test_err ("got an error when we shouldn't have" );
@@ -283,7 +283,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)*/ setup_file_extents (root, sectorsize); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 , (u64)-1 ,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 , (u64)-1 );if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -305,7 +305,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -333,7 +333,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -356,7 +356,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* Regular extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -384,7 +384,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* The next 3 are split extents */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -413,7 +413,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -435,7 +435,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -469,7 +469,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* Prealloc extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -498,7 +498,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* The next 3 are a half written prealloc extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -528,7 +528,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -561,7 +561,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -596,7 +596,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* Now for the compressed extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -630,7 +630,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* Split compressed extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -665,7 +665,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -692,7 +692,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -727,8 +727,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)free_extent_map (em);/* A hole between regular extents but no hole extent */ - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset +6 , - sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset +6 , sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -755,7 +754,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset,SZ_4M ,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset,SZ_4M );if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -788,7 +787,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) offset = em->start + em->len;free_extent_map (em); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset, sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -872,7 +871,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)insert_inode_item_key (root);insert_extent (root, sectorsize, sectorsize, sectorsize,0 , sectorsize, sectorsize,BTRFS_FILE_EXTENT_REG ,0 ,1 ); - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 ,2 * sectorsize,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 ,0 ,2 * sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
@@ -895,7 +894,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , sectorsize, -2 * sectorsize,0 ); +2 * sectorsize);if (IS_ERR (em)) {test_err ("got an error when we shouldn't have" ); goto out;
Re: [PATCH 1/9] btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
In reply to Omar SandovalLooks good,
Re: [PATCH 2/9] btrfs: remove dead snapshot-aware defrag code
In reply to Omar SandovalLooks good,
Re: [PATCH 3/9] btrfs: make btrfs_ordered_extent naming consistent with btrfs_file_extent_item
In reply to Omar SandovalLooks good,
Re: [PATCH 4/9] btrfs: remove unnecessary pg_offset assignments in __extent_writepage()
In reply to Omar SandovalLooks good,
Re: [PATCH 5/9] btrfs: remove trivial goto label in __extent_writepage()
In reply to Omar SandovalOn Mon, Dec 02, 2019 at 05:34:21PM -0800, Omar Sandoval wrote:
[...]
fs/btrfs/extent_io.c static int __extent_writepage(struct page *page, struct writeback_control *wbc, · line 3601
Quoted 12 lines
fs/btrfs/extent_io.c +1
-1@@ -3596,7 +3596,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,if (!epd->extent_locked) { ret =writepage_delalloc (inode, page, wbc, start, &nr_written);if (ret ==1 ) - goto done_unlocked; +return 0 ;if (ret) goto done;
Unrelated side note, wouldn't it be more obvious if we do
if (ret == 1) return 0; if (ret < 0) goto done;
as writepage_delalloc() returns 1, 0, and < 1
Anyways this is not really related to this patch,
Re: [PATCH 8/9] btrfs: simplify compressed/inline check in __extent_writepage_io()
In reply to Omar SandovalLooks good,
Re: [PATCH 9/9] btrfs: remove struct find_free_extent.ram_bytes
In reply to Omar SandovalQuoted 24 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
This hasn't been used since it was first introduced in commit
b4bd745d1230("btrfs: Introducefind_free_extent_ctlstructure for later rework").Signed-off-by Omar Sandoval <[email protected]>--- fs/btrfs/extent-tree.c | 2 -- 1 file changed, 2 deletions(-)fs/btrfs/extent-tree.c +0
-1@@ -3437,7 +3437,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,*/ struct find_free_extent_ctl {/* Basic allocation info */ -u64 ram_bytes;u64 num_bytes;u64 empty_size;u64 flags;
fs/btrfs/extent-tree.c static noinline int find_free_extent(struct btrfs_fs_info *fs_info, · line 3813
Quoted 7 lines
fs/btrfs/extent-tree.c +0
-1@@ -3809,7 +3808,6 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info,WARN_ON (num_bytes < fs_info->sectorsize); - ffe_ctl.ram_bytes = ram_bytes; ffe_ctl.num_bytes = num_bytes; ffe_ctl.empty_size = empty_size; ffe_ctl.flags = flags;
Either that or pass in a find_free_extent_ctl to btrfs_add_reserved_bytes() as ram_bytes, num_bytes and delalloc are set in ffe_ctl. I personally would favour passing in ffe_ctl to btrfs_add_reserved_bytes() as well as others like btrfs_add_free_space(), btrfs_free_reserved_bytes() and so on.
Re: [PATCH 9/9] btrfs: remove struct find_free_extent.ram_bytes
Quoted 28 lines · Johannes Thumshirn
Quoted 27 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
This hasn't been used since it was first introduced in commit
b4bd745d1230("btrfs: Introducefind_free_extent_ctlstructure for later rework").Signed-off-by Omar Sandoval <[email protected]>--- fs/btrfs/extent-tree.c | 2 -- 1 file changed, 2 deletions(-)fs/btrfs/extent-tree.c +0
-1@@ -3437,7 +3437,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,*/ struct find_free_extent_ctl {/* Basic allocation info */ -u64 ram_bytes;u64 num_bytes;u64 empty_size;u64 flags;@@ -3809,7 +3808,6 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info,WARN_ON (num_bytes < fs_info->sectorsize);
Quoted 9 lines
fs/btrfs/extent-tree.c static noinline int find_free_extent(struct btrfs_fs_info *fs_info, · line 3813
Quoted 4 lines
fs/btrfs/extent-tree.c +0
-1- ffe_ctl.ram_bytes = ram_bytes; ffe_ctl.num_bytes = num_bytes; ffe_ctl.empty_size = empty_size; ffe_ctl.flags = flags;Either that or pass in a
find_free_extent_ctltobtrfs_add_reserved_bytes()asram_bytes,num_bytesand delalloc are set inffe_ctl. I personally would favour passing inffe_ctltobtrfs_add_reserved_bytes()as well as others likebtrfs_add_free_space(),btrfs_free_reserved_bytes()and so on.
That might be more convenient but it feels a little icky and layer violating to me. It'd be nice to keep the space_info code separate from find_free_extent.
Re: [PATCH 1/9] btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
In reply to Omar SandovalQuoted 15 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
Currently, we have two wrappers for
__btrfs_lookup_bio_sums():btrfs_lookup_bio_sums_dio(), which is used for direct I/O, andbtrfs_lookup_bio_sums(), which is used everywhere else. The only difference is that the_diovariant looks up csums starting at the given offset instead of using the page index, which isn't actually direct I/O-specific. Let's clean up the signature and return value of__btrfs_lookup_bio_sums(), rename it tobtrfs_lookup_bio_sums(), and get rid of the trivial helpers.(quoted diff) +1
-1ret = btrfs_lookup_bio_sums(inode, comp_bio, - sums); + false, 0, sums);
Review
Quoted 10 lines
(quoted diff) +4
-4- ret = btrfs_lookup_bio_sums(inode, comp_bio, sums); + ret = btrfs_lookup_bio_sums(inode, comp_bio, false, 0, sums); - ret = btrfs_lookup_bio_sums(inode, bio, NULL); + ret = btrfs_lookup_bio_sums(inode, bio, false, 0, NULL); - ret = btrfs_lookup_bio_sums_dio(inode, dip->orig_bio, - file_offset); + ret = btrfs_lookup_bio_sums(inode, dip->orig_bio, true, + file_offset, NULL);
Can't we also get rid of the at_offset parameter? Encoding that into file_offset itself where at_offset=true would be some special placeholder like (u64)-1 that can never be a valid file offset.
Re: [PATCH 2/9] btrfs: remove dead snapshot-aware defrag code
In reply to Omar SandovalQuoted 6 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
Snapshot-aware defrag has been disabled since commit
8101c8dbf624("Btrfs: disable snapshot aware defrag for now") almost 6 years ago. Let's remove the dead code. If someone is up to the task of bringing it back, they can dig it up from git.
While I usually stand against code deletionists, in this case I will not and apply the patch. This is a good example how not to implement features or do post-merge stabilization. There were runtime problems with defrag on heavily referenced extents (many snapshots) so this was the main reason to disable it. There's a patchset from Josef from 2014 bitrotting in some of his trees that was supposed to fix it but this hasn't happen.
Defrag has been known to break reflinks, from what I've heared some users want that behaviour while others not. So this would be good to make selectable on the defrag ioctl level. This is a broader task and from brief look I haven't seen an easy way how to wire that to the current ioctl. Which means a deeper analysis and design needs to happen first.
Re: [PATCH 6/9] btrfs: remove redundant i_size check in __extent_writepage_io()
In reply to Omar SandovalQuoted 21 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
In
__extent_writepage_io(), we check whetheri_size<=page_offset(page).Note that if
i_size<page_offset(page), theni_size>>PAGE_SHIFT<page->index. Ifi_size==page_offset(page), theni_size>>PAGE_SHIFT==page->index&&offset_in_page(i_size)== 0.
__extent_writepage()already has a check for these cases that returns without calling__extent_writepage_io():end_index = i_size >> PAGE_SHIFT pg_offset = offset_in_page(i_size); if (page->index > end_index || (page->index == end_index && !pg_offset)) { page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); unlock_page(page); return 0; }
Quoted 4 lines
Get rid of the one in
__extent_writepage_io(), which was obsoleted in211c17f51f46("Fix corners in writepage andbtrfs_truncate_page").Signed-off-by Omar Sandoval <[email protected]>
Re: [PATCH 3/9] btrfs: make btrfs_ordered_extent naming consistent with btrfs_file_extent_item
In reply to Omar SandovalQuoted 10 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
ordered->start,ordered->len, andordered->disk_lencorrespond tofi->disk_bytenr,fi->num_bytes, andfi->disk_num_bytes, respectively. It's confusing to translate between the two naming schemes. Since abtrfs_ordered_extentis basically a pendingbtrfs_file_extent_item, let's make the former use the naming from the latter.Note that I didn't touch the names in tracepoints just in case there are scripts depending on the current naming.
Ok, though we've changed tracepoint strings as needed, it's sort of ABI but also not. In this case the change would affect 4 tracepoints.
Re: [PATCH 1/9] btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
In reply to David SterbaQuoted 22 lines · David Sterba
Quoted 20 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
Currently, we have two wrappers for
__btrfs_lookup_bio_sums():btrfs_lookup_bio_sums_dio(), which is used for direct I/O, andbtrfs_lookup_bio_sums(), which is used everywhere else. The only difference is that the_diovariant looks up csums starting at the given offset instead of using the page index, which isn't actually direct I/O-specific. Let's clean up the signature and return value of__btrfs_lookup_bio_sums(), rename it tobtrfs_lookup_bio_sums(), and get rid of the trivial helpers.(quoted diff) +3
-3ret = btrfs_lookup_bio_sums(inode, comp_bio, - sums); + false, 0, sums); - ret = btrfs_lookup_bio_sums(inode, comp_bio, sums); + ret = btrfs_lookup_bio_sums(inode, comp_bio, false, 0, sums); - ret = btrfs_lookup_bio_sums(inode, bio, NULL); + ret = btrfs_lookup_bio_sums(inode, bio, false, 0, NULL);
Quoted 8 lines
fs/btrfs/inode.c static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode, · line 8360
Quoted 4 lines
fs/btrfs/inode.c +2
-2- ret =btrfs_lookup_bio_sums_dio (inode, dip->orig_bio, - file_offset); + ret =btrfs_lookup_bio_sums (inode, dip->orig_bio, true, + file_offset,NULL );Can't we also get rid of the
at_offsetparameter? Encoding that intofile_offsetitself where at_offset=true would be some special placeholder like (u64)-1 that can never be a valid file offset.
Yeah Nikolay mentioned this as well but I was on the fence about whether it would look any nicer. I'll go ahead and make that change.
Re: [PATCH 1/9] btrfs: get rid of trivial __btrfs_lookup_bio_sums() wrappers
Quoted 32 lines · Omar Sandoval
Quoted 22 lines · David Sterba
Quoted 20 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
Currently, we have two wrappers for
__btrfs_lookup_bio_sums():btrfs_lookup_bio_sums_dio(), which is used for direct I/O, andbtrfs_lookup_bio_sums(), which is used everywhere else. The only difference is that the_diovariant looks up csums starting at the given offset instead of using the page index, which isn't actually direct I/O-specific. Let's clean up the signature and return value of__btrfs_lookup_bio_sums(), rename it tobtrfs_lookup_bio_sums(), and get rid of the trivial helpers.(quoted diff) +3
-3ret = btrfs_lookup_bio_sums(inode, comp_bio, - sums); + false, 0, sums); - ret = btrfs_lookup_bio_sums(inode, comp_bio, sums); + ret = btrfs_lookup_bio_sums(inode, comp_bio, false, 0, sums); - ret = btrfs_lookup_bio_sums(inode, bio, NULL); + ret = btrfs_lookup_bio_sums(inode, bio, false, 0, NULL);Quoted 8 lines
fs/btrfs/inode.c static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode, · line 8360
Quoted 4 lines
fs/btrfs/inode.c +2
-2- ret =btrfs_lookup_bio_sums_dio (inode, dip->orig_bio, - file_offset); + ret =btrfs_lookup_bio_sums (inode, dip->orig_bio, true, + file_offset,NULL );Can't we also get rid of the
at_offsetparameter? Encoding that intofile_offsetitself where at_offset=true would be some special placeholder like (u64)-1 that can never be a valid file offset.
Quoted 2 lines
Yeah Nikolay mentioned this as well but I was on the fence about whether it would look any nicer. I'll go ahead and make that change.
Ok, let's do that as another patch so it's not mixed to the helper removal. Thanks.
Re: [PATCH 3/9] btrfs: make btrfs_ordered_extent naming consistent with btrfs_file_extent_item
In reply to David SterbaQuoted 9 lines · David Sterba
Quoted 8 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
ordered->start,ordered->len, andordered->disk_lencorrespond tofi->disk_bytenr,fi->num_bytes, andfi->disk_num_bytes, respectively. It's confusing to translate between the two naming schemes. Since abtrfs_ordered_extentis basically a pendingbtrfs_file_extent_item, let's make the former use the naming from the latter.
Quoted 5 lines
Quoted 2 lines
Note that I didn't touch the names in tracepoints just in case there are scripts depending on the current naming.
Ok, though we've changed tracepoint strings as needed, it's sort of ABI but also not. In this case the change would affect 4 tracepoints.
What would you prefer in this case?
PATCH 1/1 btrfs: get rid of at_offset parameter to btrfs_lookup_bio_sums()
In reply to David SterbaFrom: Omar Sandoval <[email protected]>
We can encode this in the offset parameter: -1 means use the page offsets, anything else is a valid offset.
---
Feel free to fold this in or apply separately as needed.
fs/btrfs/compression.c | 6 +++--- fs/btrfs/ctree.h | 2 +- fs/btrfs/file-item.c | 11 +++++------ fs/btrfs/inode.c | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-)
fs/btrfs/compression.c +3 -3
@@ -757,8 +757,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,refcount_inc (&cb->pending_bios);if (!(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { - ret =btrfs_lookup_bio_sums (inode, comp_bio, - false,0 , sums); + ret =btrfs_lookup_bio_sums (inode, comp_bio,-1 , + sums);BUG_ON (ret);/* -ENOMEM */ }
@@ -786,7 +786,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,BUG_ON (ret);/* -ENOMEM */ if (!(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { - ret =btrfs_lookup_bio_sums (inode, comp_bio, false,0 , sums); + ret =btrfs_lookup_bio_sums (inode, comp_bio,-1 , sums);BUG_ON (ret);/* -ENOMEM */ }
fs/btrfs/ctree.h +1 -1
@@ -2789,7 +2789,7 @@ struct btrfs_dio_private;int btrfs_del_csums (struct btrfs_trans_handle *trans,struct btrfs_fs_info *fs_info,u64 bytenr,u64 len);blk_status_t btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, -bool at_offset,u64 offset,u8 *dst); +u64 offset,u8 *dst); int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid, u64 pos,
fs/btrfs/file-item.c +5 -6
@@ -152,17 +152,15 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,* btrfs_lookup_bio_sums - Look up checksums for a bio. * @inode: inode that the bio is for. * @bio: bio embedded in btrfs_io_bio. -* @at_offset: If true, look up checksums for the extent at @offset. -* If false, use the page offsets from the bio. -* @offset: If @at_offset is true, offset in file to look up checksums for. -* Ignored otherwise. +* @offset: Unless -1, look up checksums for this offset in the file. If -1, use +* the page offsets from the bio instead. * @dst: Buffer of size btrfs_super_csum_size() used to return checksum. If * NULL, the checksum is returned in btrfs_io_bio(bio)->csum instead. * * Return: BLK_STS_RESOURCE if allocating memory fails, BLK_STS_OK otherwise. */ blk_status_t btrfs_lookup_bio_sums (struct inode *inode,struct bio *bio, -bool at_offset,u64 offset,u8 *dst) +u64 offset,u8 *dst) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct bio_vec bvec;
@@ -171,6 +169,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio,struct btrfs_csum_item *item =NULL ;struct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree;struct btrfs_path *path; +bool page_offsets = offset == (u64)-1 ;u8 *csum;u64 item_start_offset =0 ;u64 item_last_offset =0 ;
@@ -223,7 +222,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio,if (count) goto next; -if (!at_offset) +if (page_offsets) offset =page_offset (bvec.bv_page) + bvec.bv_offset; count =btrfs_find_ordered_sum (inode, offset, disk_bytenr, csum, nblocks);
fs/btrfs/inode.c +3 -3
@@ -2127,7 +2127,7 @@ static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio, bio_flags); goto out; }else if (!skip_sum) { - ret =btrfs_lookup_bio_sums (inode, bio, false,0 ,NULL ); + ret =btrfs_lookup_bio_sums (inode, bio,-1 ,NULL );if (ret) goto out; }
@@ -7690,8 +7690,8 @@ static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode,* contention. */ if (dip->logical_offset == file_offset) { - ret =btrfs_lookup_bio_sums (inode, dip->orig_bio, true, - file_offset,NULL ); + ret =btrfs_lookup_bio_sums (inode, dip->orig_bio, file_offset, +NULL );if (ret)return ret; }
Signature · 1 line
2.24.0
Quoted 11 lines · Omar Sandoval
This series includes several cleanups. Patches 1-3 are the standalone cleanups from my
RWF_ENCODEDseries [1] (as requested by Dave). Patches 4-8 clean up code rot in the writepage codepath. Patch 9 is a trivial cleanup infind_free_extent.Based on misc-next.
Thanks!
Quoted 12 lines
Omar Sandoval (9):
btrfs: get rid of trivial__btrfs_lookup_bio_sums()wrappers
btrfs: remove dead snapshot-aware defrag code
btrfs: makebtrfs_ordered_extentnaming consistent with
btrfs_file_extent_item
btrfs: remove unnecessarypg_offsetassignments in
__extent_writepage()
btrfs: remove trivial goto label in__extent_writepage()
btrfs: remove redundanti_sizecheck in__extent_writepage_io()
btrfs: drop create parameter tobtrfs_get_extent()
btrfs: simplify compressed/inline check in__extent_writepage_io()
btrfs: remove struct find_free_extent.ram_bytes
Added to misc-next with minor fixups, thanks.
Re: [PATCH 3/9] btrfs: make btrfs_ordered_extent naming consistent with btrfs_file_extent_item
In reply to Omar SandovalQuoted 10 lines · Omar Sandoval
Quoted 9 lines · David Sterba
Quoted 8 lines · Omar Sandoval
From: Omar Sandoval <[email protected]>
ordered->start,ordered->len, andordered->disk_lencorrespond tofi->disk_bytenr,fi->num_bytes, andfi->disk_num_bytes, respectively. It's confusing to translate between the two naming schemes. Since abtrfs_ordered_extentis basically a pendingbtrfs_file_extent_item, let's make the former use the naming from the latter.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Note that I didn't touch the names in tracepoints just in case there are scripts depending on the current naming.
Ok, though we've changed tracepoint strings as needed, it's sort of ABI but also not. In this case the change would affect 4 tracepoints.
What would you prefer in this case?
No change of the tracepoint strings for now.
Quoted 25 lines · David Sterba
Quoted 11 lines · Omar Sandoval
This series includes several cleanups. Patches 1-3 are the standalone cleanups from my
RWF_ENCODEDseries [1] (as requested by Dave). Patches 4-8 clean up code rot in the writepage codepath. Patch 9 is a trivial cleanup infind_free_extent.Based on misc-next.
Thanks!
Quoted 12 lines
Omar Sandoval (9):
btrfs: get rid of trivial__btrfs_lookup_bio_sums()wrappers
btrfs: remove dead snapshot-aware defrag code
btrfs: makebtrfs_ordered_extentnaming consistent with
btrfs_file_extent_item
btrfs: remove unnecessarypg_offsetassignments in
__extent_writepage()
btrfs: remove trivial goto label in__extent_writepage()
btrfs: remove redundanti_sizecheck in__extent_writepage_io()
btrfs: drop create parameter tobtrfs_get_extent()
btrfs: simplify compressed/inline check in__extent_writepage_io()
btrfs: remove struct find_free_extent.ram_bytes
Quoted 1 line
Added to misc-next with minor fixups, thanks.
Thank you!