Skip to content

btrfs: extent-map: use disk_bytenr/offset to replace block_start/block_len/orig_start

Qu Wenruo linux-btrfs 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 0 repliesNew

Changes in v1 from the cover letter

- Rebased to the latest for-next
To resolve the conflicts with the recently introduced extent map shrinker

- A new cleanup patch to remove the recursive header inclusion

- Use a new structure to pass the file extent item related members around

- Add a new comment on why we're intentionally passing incorrect numbers for NOCOW/PREALLOC ordered extents inside btrfs_create_dio_extent()

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9btrfs: remove the recursive include of btrfs_inode.h from itselffs/btrfs/btrfs_inode.h+0 -10 replies
2/9btrfs: rename extent_map::orig_block_len to disk_num_bytesfs/btrfs/extent_map.c fs/btrfs/extent_map.h fs/btrfs/file-item.c +3 more+20 -200 replies
3/9btrfs: export the expected file extent through can_nocow_extent()fs/btrfs/btrfs_inode.h fs/btrfs/file.c fs/btrfs/inode.c+39 -50 replies
4/9btrfs: introduce new members for extent_mapfs/btrfs/defrag.c fs/btrfs/extent_map.c fs/btrfs/extent_map.h +3 more+155 -110 replies
5/9btrfs: introduce extra sanity checks for extent mapsfs/btrfs/extent_map.c fs/btrfs/relocation.c fs/btrfs/tests/extent-map-tests.c +1 more+126 -20 replies
6/9btrfs: remove extent_map::orig_start memberfs/btrfs/btrfs_inode.h fs/btrfs/compression.c fs/btrfs/defrag.c +10 more+60 -1380 replies
7/9btrfs: remove extent_map::block_len memberfs/btrfs/compression.c fs/btrfs/extent_map.c fs/btrfs/extent_map.h +7 more+42 -1050 replies
8/9btrfs: remove extent_map::block_start memberfs/btrfs/compression.c fs/btrfs/defrag.c fs/btrfs/extent_io.c +11 more+172 -2070 replies
9/9btrfs: remove parameters duplicated from btrfs_file_extentfs/btrfs/btrfs_inode.h fs/btrfs/file.c fs/btrfs/inode.c +2 more+95 -1420 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/9] btrfs: extent-map: use disk_bytenr/offset to replace block_start/block_len/orig_start

[CHANGELOG]
v1:
- Rebased to the latest for-next
To resolve the conflicts with the recently introduced extent map shrinker

- A new cleanup patch to remove the recursive header inclusion

- Use a new structure to pass the file extent item related members around

- Add a new comment on why we're intentionally passing incorrect numbers for NOCOW/PREALLOC ordered extents inside btrfs_create_dio_extent()

[REPO]
https://github.com/adam900710/linux/tree/em_cleanup

This series introduce two new members (disk_bytenr/offset) to extent_map, and removes three old members (block_start/block_len/offset), finally rename one member (orig_block_len -> disk_num_bytes).

This should save us one u64 for extent_map, although with the recent extent map shrinker, the saving is not that useful.

But to make things safe to migrate, I introduce extra sanity checks for extent_map, and do cross check for both old and new members.

The extra sanity checks already exposed one bug (thankfully harmless) causing em::block_start to be incorrect.

But so far, the patchset is fine for default fstests run.

Furthermore, since we're already having too long parameter lists for extent_map/ordered_extent/can_nocow_extent, here is a new structure, btrfs_file_extent, a memory-access-friendly structure to represent a btrfs_file_extent_item.

With the help of that structure, we can use that to represent a file extent item without a super long parameter list.

The patchset would do one cleanup first, then rename orig_block_len to disk_num_bytes.
Then introduce the new member, the extra sanity checks. Finally introduce the new btrfs_file_extent structure and use that to remove the older 3 members from extent_map.

Qu Wenruo (9):
btrfs: remove the recursive include of btrfs_inode.h from itself
btrfs: rename extent_map::orig_block_len to disk_num_bytes
btrfs: export the expected file extent through can_nocow_extent()
btrfs: introduce new members for extent_map
btrfs: introduce extra sanity checks for extent maps
btrfs: remove extent_map::orig_start member
btrfs: remove extent_map::block_len member
btrfs: remove extent_map::block_start member
btrfs: remove parameters duplicated from btrfs_file_extent

 fs/btrfs/btrfs_inode.h            |   6 +-
 fs/btrfs/compression.c            |   7 +-
 fs/btrfs/defrag.c                 |  14 +-
 fs/btrfs/extent_io.c              |  10 +-
 fs/btrfs/extent_map.c             | 187 +++++++++++------
 fs/btrfs/extent_map.h             |  51 +++--
 fs/btrfs/file-item.c              |  23 +--
 fs/btrfs/file.c                   |  18 +-
 fs/btrfs/inode.c                  | 333 +++++++++++++++---------------
 fs/btrfs/ordered-data.c           |  20 +-
 fs/btrfs/ordered-data.h           |  22 +-
 fs/btrfs/relocation.c             |   5 +-
 fs/btrfs/tests/extent-map-tests.c | 114 +++++-----
 fs/btrfs/tests/inode-tests.c      | 177 ++++++++--------
 fs/btrfs/tree-log.c               |  25 ++-
 fs/btrfs/zoned.c                  |   4 +-
 include/trace/events/btrfs.h      |  26 +--
 17 files changed, 560 insertions(+), 482 deletions(-)
Signature · 1 line
2.44.0