Btrfs: add helper to get the end offset of a file extent item
PATCH 1/3 Btrfs: add helper to get the end offset of a file extent item
From: Filipe Manana <[email protected]>
Getting the end offset for a file extent item requires a bit of code since the extent can be either inline or regular/prealloc. There are some places all over the code base that open code this logic and in another patch later in this series it will be needed again. Therefore encapsulate this logic in a helper function and use it.
Signed-off-by Filipe Manana <[email protected]>
--- fs/btrfs/ctree.h | 1 + fs/btrfs/file-item.c | 40 ++++++++++++++++++++++++++++------------ fs/btrfs/inode.c | 10 +--------- fs/btrfs/send.c | 44 +++----------------------------------------- fs/btrfs/tree-log.c | 15 +-------------- 5 files changed, 34 insertions(+), 76 deletions(-)
fs/btrfs/ctree.h +1 -0
@@ -2852,6 +2852,7 @@ int btrfs_inode_clear_file_extent_range(struct btrfs_inode *inode, u64 start,int btrfs_inode_set_file_extent_range (struct btrfs_inode *inode,u64 start,u64 len);void btrfs_inode_safe_disk_i_size_write (struct inode *inode,u64 new_i_size); +u64 btrfs_file_extent_end (const struct btrfs_path *path);/* inode.c */ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
fs/btrfs/file-item.c +28 -12
@@ -1040,18 +1040,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,btrfs_item_key_to_cpu (leaf, &key, slot); extent_start = key.offset; - -if (type ==BTRFS_FILE_EXTENT_REG || - type ==BTRFS_FILE_EXTENT_PREALLOC ) { - extent_end = extent_start + -btrfs_file_extent_num_bytes (leaf, fi); - }else if (type ==BTRFS_FILE_EXTENT_INLINE ) { -size_t size; - size =btrfs_file_extent_ram_bytes (leaf, fi); - extent_end =ALIGN (extent_start + size, - fs_info->sectorsize); - } - + extent_end =btrfs_file_extent_end (path); em->ram_bytes =btrfs_file_extent_ram_bytes (leaf, fi);if (type ==BTRFS_FILE_EXTENT_REG || type ==BTRFS_FILE_EXTENT_PREALLOC ) {
@@ -1098,3 +1087,30 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, root->root_key.objectid); } } + +/* +* Returns the end offset (non inclusive) of the file extent item the given path +* points to. If it points to an inline extent, the returned offset is rounded +* up to the sector size. +*/ +u64 btrfs_file_extent_end (const struct btrfs_path *path) +{ +const struct extent_buffer *leaf = path->nodes[0 ]; +const int slot = path->slots[0 ]; +struct btrfs_file_extent_item *fi; +struct btrfs_key key; +u64 end; + +btrfs_item_key_to_cpu (leaf, &key, slot); +ASSERT (key.type ==BTRFS_EXTENT_DATA_KEY ); + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); + +if (btrfs_file_extent_type (leaf, fi) ==BTRFS_FILE_EXTENT_INLINE ) { + end =btrfs_file_extent_ram_bytes (leaf, fi); + end =ALIGN (key.offset + end, leaf->fs_info->sectorsize); + }else { + end = key.offset +btrfs_file_extent_num_bytes (leaf, fi); + } + +return end; +}
fs/btrfs/inode.c +1 -9
@@ -6520,6 +6520,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, extent_type =btrfs_file_extent_type (leaf, item); extent_start = found_key.offset; + extent_end =btrfs_file_extent_end (path);if (extent_type ==BTRFS_FILE_EXTENT_REG || extent_type ==BTRFS_FILE_EXTENT_PREALLOC ) {/* Only regular file could have regular/prealloc extent */
@@ -6530,18 +6531,9 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, btrfs_ino(inode)); goto out; } - extent_end = extent_start + -btrfs_file_extent_num_bytes (leaf, item); -trace_btrfs_get_extent_show_fi_regular (inode, leaf, item, extent_start); }else if (extent_type ==BTRFS_FILE_EXTENT_INLINE ) { -size_t size; - - size =btrfs_file_extent_ram_bytes (leaf, item); - extent_end =ALIGN (extent_start + size, - fs_info->sectorsize); -trace_btrfs_get_extent_show_fi_inline (inode, leaf, item, path->slots[0 ], extent_start);
fs/btrfs/send.c +3 -41
81 lines not on this page · raw message
fs/btrfs/tree-log.c +1 -14
@@ -4555,9 +4555,7 @@ static int btrfs_log_holes(struct btrfs_trans_handle *trans,return ret;while (true) { -struct btrfs_file_extent_item *extent;struct extent_buffer *leaf = path->nodes[0 ]; -u64 len;if (path->slots[0 ] >=btrfs_header_nritems (path->nodes[0 ])) { ret =btrfs_next_leaf (root, path);
@@ -4606,18 +4604,7 @@ static int btrfs_log_holes(struct btrfs_trans_handle *trans, leaf = path->nodes[0 ]; } - extent =btrfs_item_ptr (leaf, path->slots[0 ], - struct btrfs_file_extent_item); -if (btrfs_file_extent_type (leaf, extent) == -BTRFS_FILE_EXTENT_INLINE ) { - len =btrfs_file_extent_ram_bytes (leaf, extent); - prev_extent_end =ALIGN (key.offset + len, - fs_info->sectorsize); - }else { - len =btrfs_file_extent_num_bytes (leaf, extent); - prev_extent_end = key.offset + len; - } - + prev_extent_end =btrfs_file_extent_end (path); path->slots[0 ]++;cond_resched (); }
Signature · 1 line
2.11.0