Skip to content

btrfs-progs: handle orphan directories properly

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. v2 Latest posting 2/22 patches 1 replyIn review
  2. v2 posting 1/22 patches 0 repliesSuperseded
  3. v12 patches 0 repliesSuperseded

Changes in v2 from the cover letter

- use "is_orphan" not "has_orphan_item" in the mode-lowmem code. Somehow the compiler didn't warn me of this until I switched to a different branch.

Patches in v2 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2btrfs-progs: handle orphan directories properlycheck/main.c check/mode-lowmem.c+18 -30 replies
2/2btrfs-progs: add a test to check orphaned directoriestests/fsck-tests/052-orphan-directory/default.img.xz tests/fsck-tests/052-orphan-directory/test.sh+20 -00 replies

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH v2 0/2][RESEND] btrfs-progs: handle orphan directories properly

v1->v2:
- use "is_orphan" not "has_orphan_item" in the mode-lowmem code. Somehow the compiler didn't warn me of this until I switched to a different branch.

--- Original email ---
Hello,

While implementing the garbage collection tree I started getting btrfsck errors when a test would do rm -rf DIRECTORY and then immediately unmount. This is because we stop processing GC items during umount, and thus we left the directory with an nlink == 0 and all of its children in the fs tree.

However this isn't a problem with just the GC tree, we can have this happen if we fail to do the eviction work at evict time, and we leave the orphan entry in place on disk. btrfsck properly ignores problems with inodes that have orphan items, except for directory inodes.

Fix this by making sure we don't add any backrefs we find from directory inodes that we've find the inode item for and have an nlink == 0.

I generated a test image for this by simply skipping the btrfs_truncate_inode_items() work in evict in a kernel and rm -rf'ing a directory on a test file system.

With this patch both make test-check and make test-check-lowmem pass all the tests, including the new testcase. Thanks,

Josef

Josef Bacik (2):
btrfs-progs: handle orphan directories properly
btrfs-progs: add a test to check orphaned directories

 check/main.c                                  |  15 ++++++++++++-
 check/mode-lowmem.c                           |   6 ++++--
 .../052-orphan-directory/default.img.xz       | Bin 0 -> 1432 bytes
 tests/fsck-tests/052-orphan-directory/test.sh |  20 ++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 tests/fsck-tests/052-orphan-directory/default.img.xz
 create mode 100755 tests/fsck-tests/052-orphan-directory/test.sh
Signature · 1 line
2.26.3