Skip to content

Truncate cleanups and preparation work

Josef Bacik linux-btrfs 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18btrfs: add an inode-item.hfs/btrfs/ctree.h fs/btrfs/delayed-inode.c fs/btrfs/free-space-cache.c +5 more+43 -301 reply
2/18btrfs: move btrfs_truncate_inode_items to inode-item.cfs/btrfs/ctree.h fs/btrfs/inode-item.c fs/btrfs/inode-item.h +1 more+390 -3910 replies
3/18btrfs: move extent locking outside of btrfs_truncate_inode_itemsfs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode.c+31 -250 replies
4/18btrfs: remove free space cache inode check in btrfs_truncate_inode_itemsfs/btrfs/inode-item.c+3 -50 replies
5/18btrfs: move btrfs_kill_delayed_inode_items into evictfs/btrfs/inode-item.c fs/btrfs/inode.c+12 -90 replies
6/18btrfs: remove found_extent from btrfs_truncate_inode_itemsfs/btrfs/inode-item.c+3 -60 replies
7/18btrfs: add btrfs_truncate_control structfs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +2 more+46 -280 replies
8/18btrfs: only update i_size in truncate paths that carefs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +1 more+18 -90 replies
9/18btrfs: only call inode_sub_bytes in truncate paths that carefs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +1 more+11 -140 replies
10/18btrfs: control extent reference updates with a control flag for truncatefs/btrfs/inode-item.c fs/btrfs/inode-item.h fs/btrfs/tree-log.c+8 -20 replies
11/18btrfs: use a flag to control when to clear the file extent rangefs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +1 more+12 -40 replies
12/18btrfs: pass the ino via btrfs_truncate_controlfs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +2 more+10 -40 replies
13/18btrfs: add inode to btrfs_truncate_controlfs/btrfs/free-space-cache.c fs/btrfs/inode-item.c fs/btrfs/inode-item.h +2 more+34 -190 replies
14/18btrfs: convert BUG_ON() in btrfs_truncate_inode_items to ASSERTfs/btrfs/inode-item.c+1 -10 replies
15/18btrfs: convert BUG() for pending_del_nr into an ASSERTfs/btrfs/inode-item.c+3 -20 replies
16/18btrfs: combine extra if statements in btrfs_truncate_inode_itemsfs/btrfs/inode-item.c+2 -40 replies
17/18btrfs: make should_throttle loop local in btrfs_truncate_inode_itemsfs/btrfs/inode-item.c+1 -20 replies
18/18btrfs: do not check -EAGAIN when truncating inodes in the log rootfs/btrfs/tree-log.c+1 -60 replies

Reviews trailers per patch

None of the 18 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchFilipe Manana
SeriesR-b
1/18
2/18
3/18
4/18
5/18
6/18
7/18
8/18
9/18
10/18
11/18
12/18
13/18
14/18
15/18
16/18
17/18
18/18

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/18] Truncate cleanups and preparation work

Hello,

The first thing I'm implementing with the garbage collection tree is btrfs_truncate_inode_items() on evicted inodes. However btrfs_truncate_inode_items() has a lot of oddities that it's grown over the years, and requires having a valid btrfs_inode to use. We don't really want to have to look up the old inode to do the truncate, we just want to do the tree operaitons to delete all of the objects and extents.

Enter this patch series, I've cleaned up btrfs_truncate_inode_items(), moved as much of the inode operations out to the respective callers, and cleaned up the argument passing and such to make it a little cleaner.

We still have to pass in the inode for the ^NO_HOLES case for the normal truncate path, but other than that I've stripped it down so that we can pass in a NULL inode and get all the work done.

This has the nice side-effect of cleaning up a lot of our

if (root == LOG_ROOT)

	// do something else

checks in this helper, and hopefully makes it more straightforward to understand. Thanks,

Josef

Josef Bacik (18):
btrfs: add an inode-item.h
btrfs: move btrfs_truncate_inode_items to inode-item.c
btrfs: move extent locking outside of btrfs_truncate_inode_items
btrfs: remove free space cache inode check in
btrfs_truncate_inode_items
btrfs: move btrfs_kill_delayed_inode_items into evict
btrfs: remove found_extent from btrfs_truncate_inode_items
btrfs: add btrfs_truncate_control struct
btrfs: only update i_size in truncate paths that care
btrfs: only call inode_sub_bytes in truncate paths that care
btrfs: control extent reference updates with a control flag for
truncate
btrfs: use a flag to control when to clear the file extent range
btrfs: pass the ino via btrfs_truncate_control
btrfs: add inode to btrfs_truncate_control
btrfs: convert BUG_ON() in btrfs_truncate_inode_items to ASSERT
btrfs: convert BUG() for pending_del_nr into an ASSERT
btrfs: combine extra if statements in btrfs_truncate_inode_items
btrfs: make should_throttle loop local in btrfs_truncate_inode_items
btrfs: do not check -EAGAIN when truncating inodes in the log root

 fs/btrfs/ctree.h            |  34 ---
 fs/btrfs/delayed-inode.c    |   1 +
 fs/btrfs/free-space-cache.c |  31 ++-
 fs/btrfs/inode-item.c       | 334 ++++++++++++++++++++++++++
 fs/btrfs/inode-item.h       |  86 +++++++
 fs/btrfs/inode.c            | 452 +++++-------------------------------
 fs/btrfs/relocation.c       |   1 +
 fs/btrfs/tree-log.c         |  15 +-
 8 files changed, 511 insertions(+), 443 deletions(-)
 create mode 100644 fs/btrfs/inode-item.h
Signature · 1 line
2.26.3