Skip to content

btrfs: snapshot delete cleanups

Josef Bacik linux-btrfs 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest15 patches 3 repliesIn review
  2. v215 patches 1 replySuperseded
  3. v115 patches 4 repliesSuperseded

Changes in v3 from the cover letter

- Fixed the bug pointed out by Dan https://lore.kernel.org/all/[email protected]/

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15btrfs: don't do find_extent_buffer in do_walk_downfs/btrfs/extent-tree.c+6 -100 replies
2/15btrfs: remove all extra btrfs_check_eb_owner() callsfs/btrfs/ctree.c fs/btrfs/disk-io.c+1 -101 reply
3/15btrfs: use btrfs_read_extent_buffer in do_walk_downfs/btrfs/extent-tree.c+4 -110 replies
4/15btrfs: push lookup_info into walk_controlfs/btrfs/extent-tree.c+11 -100 replies
5/15btrfs: move the eb uptodate code into it's own helperfs/btrfs/extent-tree.c+48 -200 replies
6/15btrfs: remove need_account in do_walk_downfs/btrfs/extent-tree.c+4 -50 replies
7/15btrfs: unify logic to decide if we need to walk down into a nodefs/btrfs/extent-tree.c+91 -440 replies
8/15btrfs: extract the reference dropping code into it's own helperfs/btrfs/extent-tree.c+92 -700 replies
9/15btrfs: don't BUG_ON ENOMEM in walk_down_procfs/btrfs/extent-tree.c+0 -10 replies
10/15btrfs: handle errors from ref mods during UPDATE_BACKREFfs/btrfs/extent-tree.c+12 -30 replies
11/15btrfs: replace BUG_ON with ASSERT in walk_down_procfs/btrfs/extent-tree.c+2 -20 replies
12/15btrfs: clean up our handling of refs == 0 in snapshot deletefs/btrfs/extent-tree.c+25 -50 replies
13/15btrfs: convert correctness BUG_ON()'s to ASSERT()'s in walk_up_procfs/btrfs/extent-tree.c+3 -30 replies
14/15btrfs: handle errors from btrfs_dec_ref properlyfs/btrfs/extent-tree.c+4 -10 replies
15/15btrfs: add documentation around snapshot deletefs/btrfs/extent-tree.c+52 -00 replies

Reviews trailers per patch

2 of 15 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchQu WenruoDavid Sterba
SeriesR-b
1/15R-b
2/15R-b
3/15
4/15
5/15
6/15
7/15
8/15
9/15
10/15
11/15
12/15
13/15
14/15
15/15

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

Read the v3 thread

Cover letter [PATCH v3 00/15] btrfs: snapshot delete cleanups

v2->v3:
- Fixed the bug pointed out by Dan https://lore.kernel.org/all/[email protected]/

v1->v2:
- Simply removed the btrfs_check_eb_owner() calls as per Qu's suggestion.
- Made the 0 reference count error be more verbose as per Dave's suggestion.

--- Original email ---

Hello,

In light of the recent fix for snapshot delete I looked around at the code to see if it could be cleaned up. I still feel like this could be reworked to make the two stages clearer, but this series brings a lot of cleanups and re-factoring as well as comments and documentation that hopefully make this code easier for others to work in. I've broken up the do_walk_down() function into discreet peices that are better documented and describe their use. I've also taken the opportunity to remove a bunch of BUG_ON()'s in this code. I've run this through the CI a few times as I made a couple of errors, but it's passing cleanly now. Thanks,

Josef

Josef Bacik (15):
btrfs: don't do find_extent_buffer in do_walk_down
btrfs: remove all extra btrfs_check_eb_owner() calls
btrfs: use btrfs_read_extent_buffer in do_walk_down
btrfs: push lookup_info into walk_control
btrfs: move the eb uptodate code into it's own helper
btrfs: remove need_account in do_walk_down
btrfs: unify logic to decide if we need to walk down into a node
btrfs: extract the reference dropping code into it's own helper
btrfs: don't BUG_ON ENOMEM in walk_down_proc
btrfs: handle errors from ref mods during UPDATE_BACKREF
btrfs: replace BUG_ON with ASSERT in walk_down_proc
btrfs: clean up our handling of refs == 0 in snapshot delete
btrfs: convert correctness BUG_ON()'s to ASSERT()'s in walk_up_proc
btrfs: handle errors from btrfs_dec_ref properly
btrfs: add documentation around snapshot delete

 fs/btrfs/ctree.c       |   7 +-
 fs/btrfs/disk-io.c     |   4 -
 fs/btrfs/extent-tree.c | 515 +++++++++++++++++++++++++++--------------
 3 files changed, 343 insertions(+), 183 deletions(-)
Signature · 1 line
2.43.0