| | |
|---|---|
| base of every series | `9d01fb77f46e` (`v7.1-102-g9d01fb77`), upstream btrfs-progs `devel` as of 2026-10-29: `testing^1` |
-| integration branch | `testing` `a32d935104d8` (octopus of the base and the 6 topics; `scrub-progress-socket` contains `scrub-limit-only-with-option`, which is also a parent, as on the kernel lanes) |
+| integration branch | `testing` `d541f7768952` (octopus of the base and the 6 topics; `scrub-progress-socket` contains `scrub-limit-only-with-option`, which is also a parent, as on the kernel lanes) |
| upstream `devel` now | `55f4cfb9c932` (one docs-only commit past the base; the lane has not been rebased onto it) |
Unlike the kernel lane's base, this base is a published upstream commit,
| `mkfs-remap-tree` | 1 | | Zygo | `mkfs.btrfs -O remap-tree` (experimental builds) segfaults in `write_ctree_super()` without it |
| `dump-tree-replace-stop-time` | 1 | | Zygo | dump-tree printed the dev-replace start time as the stop time |
| `replace-abort-uncorrectable` | 1 | | Zygo | `btrfs replace start --abort-on-uncorrectable`; the user space half of the kernel patch "btrfs: dev-replace: optionally abort on uncorrectable read errors" (kernel export `~/share/linux-upstream/topics/replace-fixes/`). Send with or after the kernel series: the flag value is defined there |
-| `logical-resolve-fixes` | 4 | | Zygo | Issue #400; patch 2 also resolves through bind mounts of directories; patch 3 fixes inode-resolve paths below the subvolume root (new misc-tests/074); patch 4 changes the exit status and moves a message to stderr, and updates misc-tests/042; hex addresses (defect 6) left out on purpose |
+| `logical-resolve-fixes` | 5 | | Zygo | Issue #400; patch 5 adds -z (feature); patch 2 also resolves through bind mounts of directories; patch 3 fixes inode-resolve paths below the subvolume root (new misc-tests/074); patch 4 changes the exit status and moves a message to stderr, and updates misc-tests/042; hex addresses (defect 6) left out on purpose |
| `scrub-limit-only-with-option` | 2 | | Zygo | follows up 01c8277d (Issue #1165) |
| `scrub-progress-socket` | 2 | `scrub-limit-only-with-option` | Zygo | both change the parent's branch after the fork in `scrub_start()`; patch 2 includes the combined code |
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|
-From bed8b5eb14d775f96649a15b19da6ba5d3f816b7 Mon Sep 17 00:00:00 2001
+From 85ca1f91a962d1d538d764ee25fcf3d144b2f883 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
-Date: Fri, 30 Oct 2026 18:58:57 -0400
-Subject: [PATCH 0/4] btrfs-progs: inspect logical-resolve: find the file names again
+Date: Fri, 30 Oct 2026 20:38:09 -0400
+Subject: [PATCH 0/5] btrfs-progs: inspect logical-resolve: find the file names again
To: linux-btrfs@vger.kernel.org
"btrfs inspect-internal logical-resolve" prints no file names for most
never caught defect 3: it counted a "could not be accessed" line as a
pass. The patch also adds cases to 042 where bind mounts of
directories are the only way in, and checks that the expected path is
-printed, and updates 074 for the new message and exit status.
+printed, also with a space, tab, newline and backslash in a directory
+name and in mount points (mountinfo escapes them as octal; the parser
+from e31679c1 already decodes them), and updates 074 for the new message
+and exit status.
+
+Patch 5 is a feature: -z (--zero) for both commands ends each path (and
+each -P line) with a NUL character instead of a newline, without any
+escaping, so that file names with newlines can be parsed. No progs
+command has such an option yet; the name follows coreutils' realpath,
+readlink, dirname and basename. Tests in 042 and 074.
User-visible changes:
- Patch 2: paths are printed relative to the path argument when the
- Patch 4: the "could not be accessed" messages move from stdout to
stderr, and the exit status becomes 1. This patch is separable; the
others do not depend on it.
+- Patch 5: new option -z, no change without it.
Patch 2 depends on patch 1 only for mounts in namespaces whose
propagation is not exactly one optional field; patch 3 uses the
resolver that patch 2 adds; patch 4 changes the messages that patch 2
-prints. Apply in order.
+prints; patch 5 applies on top of patch 4 (tests). Apply in order.
Link: https://github.com/kdave/btrfs-progs/issues/400
-Zygo Blaxell (4):
+Zygo Blaxell (5):
btrfs-progs: utils: parse any number of optional fields in mountinfo
btrfs-progs: inspect logical-resolve: find subvolumes under any mount
btrfs-progs: inspect inode-resolve: print paths relative to the
argument
btrfs-progs: inspect logical-resolve: fail on an unresolvable
reference
+ btrfs-progs: inspect: add -z to logical-resolve and inode-resolve
- cmds/inspect.c | 564 +++++++++++++++---
- common/utils.c | 135 ++---
+ Documentation/btrfs-inspect-internal.rst | 13 +-
+ cmds/inspect.c | 599 +++++++++++++++---
+ common/utils.c | 135 +---
common/utils.h | 3 +-
- .../test.sh | 104 +++-
- .../test.sh | 93 +++
- 5 files changed, 707 insertions(+), 192 deletions(-)
+ .../test.sh | 176 ++++-
+ .../test.sh | 120 ++++
+ 6 files changed, 846 insertions(+), 200 deletions(-)
create mode 100755 tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
From 4bd84e5ad066c7e56ef9614a459fa616c168e8e9 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Thu, 29 Oct 2026 23:28:01 -0400
-Subject: [PATCH 1/4] btrfs-progs: utils: parse any number of optional fields
+Subject: [PATCH 1/5] btrfs-progs: utils: parse any number of optional fields
in mountinfo
To: linux-btrfs@vger.kernel.org
From 0d145ccc99125895c7de885a2bd80b4d5073c063 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Thu, 29 Oct 2026 23:34:26 -0400
-Subject: [PATCH 2/4] btrfs-progs: inspect logical-resolve: find subvolumes
+Subject: [PATCH 2/5] btrfs-progs: inspect logical-resolve: find subvolumes
under any mount
To: linux-btrfs@vger.kernel.org
From 3f2c3c53d5a49700c3e0f424caae0df7c0e01164 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Fri, 30 Oct 2026 17:18:00 -0400
-Subject: [PATCH 3/4] btrfs-progs: inspect inode-resolve: print paths relative
+Subject: [PATCH 3/5] btrfs-progs: inspect inode-resolve: print paths relative
to the argument
To: linux-btrfs@vger.kernel.org
-From bed8b5eb14d775f96649a15b19da6ba5d3f816b7 Mon Sep 17 00:00:00 2001
+From a4893e1e55cc3fb55a6ff15c2dc37a7697c2c412 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Thu, 29 Oct 2026 23:34:39 -0400
-Subject: [PATCH 4/4] btrfs-progs: inspect logical-resolve: fail on an
+Subject: [PATCH 4/5] btrfs-progs: inspect logical-resolve: fail on an
unresolvable reference
To: linux-btrfs@vger.kernel.org
point, a directory in it, "." and an absolute path as the argument, and
checked to print the expected path relative to the argument, and a
file reached through the bind mount of its directory when the argument
-is elsewhere. Update misc-tests/074 for the stderr message and exit
-status.
+is elsewhere, and a directory and mount points whose names have a space,
+a tab, a newline and a backslash (escaped as octal in mountinfo) through
+the argument, a bind mount and a subvolume mount. Update misc-tests/074
+for the stderr message and exit status.
Link: https://github.com/kdave/btrfs-progs/issues/400
Assisted-by: Claude:claude-opus-5-5
---
- cmds/inspect.c | 19 ++--
- .../test.sh | 104 +++++++++++++++++-
+ cmds/inspect.c | 19 ++-
+ .../test.sh | 146 +++++++++++++++++-
.../test.sh | 7 +-
- 3 files changed, 116 insertions(+), 14 deletions(-)
+ 3 files changed, 158 insertions(+), 14 deletions(-)
diff --git a/cmds/inspect.c b/cmds/inspect.c
index 3d9a7ef8..e1ad1579 100644
out:
if (sl.fd >= 0)
diff --git a/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
-index 0ef90e93..591b78b9 100755
+index 0ef90e93..36987b4b 100755
--- a/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
+++ b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
@@ -11,22 +11,54 @@ prepare_test_dev
}
run_check_mkfs_test_dev
-@@ -49,6 +81,22 @@ run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=150 of="$TEST_MNT/@/vol1/subv
+@@ -49,6 +81,29 @@ run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=150 of="$TEST_MNT/@/vol1/subv
run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot "$TEST_MNT/@/vol1/subvol1" \
"$TEST_MNT/@/vol1/snapshot1"
+run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=4 of="$TEST_MNT/@/vol1/bdir/sub/subvol2/file4"
+run_check $SUDO_HELPER mkdir "$TEST_MNT/@/vol1/bdir/sub/subvol2/d2"
+run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=4 of="$TEST_MNT/@/vol1/bdir/sub/subvol2/d2/file5"
++# For the escaping cases: a directory of subvol2 whose name has a space, a
++# tab, a newline and a backslash, which mountinfo shows as octal escapes
++odd=$'odd \t\n\\dir'
++run_check $SUDO_HELPER mkdir "$TEST_MNT/@/vol1/bdir/sub/subvol2/$odd"
++run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=4 \
++ of="$TEST_MNT/@/vol1/bdir/sub/subvol2/$odd/file6"
+file3ino=$(stat -c %i "$TEST_MNT/@/vol1/bdir/file3")
+file4ino=$(stat -c %i "$TEST_MNT/@/vol1/bdir/sub/subvol2/file4")
+file5ino=$(stat -c %i "$TEST_MNT/@/vol1/bdir/sub/subvol2/d2/file5")
++file6ino=$(stat -c %i "$TEST_MNT/@/vol1/bdir/sub/subvol2/$odd/file6")
+
run_check "$TOP/btrfs" filesystem sync "$TEST_MNT"
run_check_umount_test_dev
-@@ -82,3 +130,53 @@ for offset in $("$TOP/btrfs" inspect-internal dump-tree -t "$subvol1id" "$TEST_D
+@@ -82,3 +137,88 @@ for offset in $("$TOP/btrfs" inspect-internal dump-tree -t "$subvol1id" "$TEST_D
done
run_check_umount_test_dev
+file3offsets=$(inode_offsets "$vol1id" "$file3ino")
+file4offsets=$(inode_offsets "$subvol2id" "$file4ino")
+file5offsets=$(inode_offsets "$subvol2id" "$file5ino")
-+[ -n "$file3offsets" ] && [ -n "$file4offsets" ] && [ -n "$file5offsets" ] ||
-+ _fail "no extents found for file3, file4 or file5"
++file6offsets=$(inode_offsets "$subvol2id" "$file6ino")
++[ -n "$file3offsets" ] && [ -n "$file4offsets" ] && [ -n "$file5offsets" ] &&
++ [ -n "$file6offsets" ] || _fail "no extents found for file3 to file6"
+
+# Bind mounts of directories are the only way in: mnt4 is vol1's directory
+# bdir, mnt5 the directory d2 of the nested subvol2. Paths are printed
+run_check_umount_test_dev mnt5
+run_check_umount_test_dev mnt4
+run_check rmdir -- mnt4 mnt5
++
++# Resolve $1 with $2 as the path argument: the output must be exactly $3,
++# which may contain any character but a trailing newline
++check_logical_offset_exact()
++{
++ local output
++
++ output=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ logical-resolve "$1" "$2")
++ if [ "$output" != "$3" ]; then
++ _fail "logical-resolve $1 $2 printed '$output', not '$3'"
++ fi
++}
++
++# Mount points and mounted directories with special characters: mnt6 is a
++# bind mount of the odd directory of subvol2 at an odd mount point, mnt7
++# the unrelated subvol1, then mnt8 subvol2 itself at an odd mount point
++run_check $SUDO_HELPER mount -o subvol=/@/vol1/bdir/sub/subvol2 "$TEST_DEV" "$TEST_MNT"
++run_check mkdir -p "mnt6 $odd" mnt7 "mnt8 $odd"
++run_check $SUDO_HELPER mount --bind "$TEST_MNT/$odd" "mnt6 $odd"
++run_check $SUDO_HELPER mount -o subvol=/@/vol1/subvol1 "$TEST_DEV" mnt7
++run_check_umount_test_dev "$TEST_MNT"
++for offset in $file6offsets; do
++ check_logical_offset_exact "$offset" "mnt6 $odd" "mnt6 $odd/file6"
++ check_logical_offset_exact "$offset" mnt7 "$PWD/mnt6 $odd/file6"
++done
++run_check $SUDO_HELPER mount -o subvol=/@/vol1/bdir/sub/subvol2 "$TEST_DEV" "mnt8 $odd"
++for offset in $file6offsets; do
++ check_logical_offset_exact "$offset" mnt7 "$PWD/mnt8 $odd/$odd/file6"
++done
++run_check_umount_test_dev "mnt8 $odd"
++run_check_umount_test_dev mnt7
++run_check_umount_test_dev "mnt6 $odd"
++run_check rmdir -- "mnt6 $odd" mnt7 "mnt8 $odd"
diff --git a/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh b/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
index 22ace0ca..0e46e4b8 100755
--- a/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
--- /dev/null
+From 85ca1f91a962d1d538d764ee25fcf3d144b2f883 Mon Sep 17 00:00:00 2001
+From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
+Date: Fri, 30 Oct 2026 20:26:49 -0400
+Subject: [PATCH 5/5] btrfs-progs: inspect: add -z to logical-resolve and
+ inode-resolve
+To: linux-btrfs@vger.kernel.org
+
+The paths that logical-resolve and inode-resolve print are file names,
+which may contain newlines, so a script cannot split the output into
+paths reliably. Add -z (--zero): end each path with a NUL character
+instead of a newline, and print it as it is, without any escaping or
+quoting. With logical-resolve -P each inode line ends with NUL instead.
+Errors still go to stderr as text.
+
+No btrfs-progs command has such an option yet. The name follows the
+coreutils commands that print file names, such as realpath, readlink,
+dirname and basename (-z, --zero). -0 is used by commands that read
+NUL-separated input (xargs -0) or for a few outputs (du -0, env -0),
+and -z is free in both commands.
+
+Add -z cases to misc-tests 042 (a path with a space, tab, newline and
+backslash, and -P) and 074 (hard links, one of them with a newline and a
+space in its name).
+
+Link: https://github.com/kdave/btrfs-progs/issues/400
+Assisted-by: Claude:claude-opus-5-5
+---
+ Documentation/btrfs-inspect-internal.rst | 13 ++++++-
+ cmds/inspect.c | 39 +++++++++++++++----
+ .../test.sh | 30 ++++++++++++++
+ .../test.sh | 27 +++++++++++++
+ 4 files changed, 99 insertions(+), 10 deletions(-)
+
+diff --git a/Documentation/btrfs-inspect-internal.rst b/Documentation/btrfs-inspect-internal.rst
+index e86135ff..f52e427c 100644
+--- a/Documentation/btrfs-inspect-internal.rst
++++ b/Documentation/btrfs-inspect-internal.rst
+@@ -137,7 +137,7 @@ dump-tree [options] <device> [device...]
+ * convenience aliases, e.g. DEVICE for the DEV tree, CHECKSUM for CSUM
+ * unrecognized ID is an error
+
+-inode-resolve [-v] <ino> <path>
++inode-resolve [-vz] <ino> <path>
+ (needs root privileges)
+
+ resolve paths to all files with given inode number *ino* in a given subvolume
+@@ -147,8 +147,12 @@ inode-resolve [-v] <ino> <path>
+
+ -v
+ (deprecated) alias for global *-v* option
++ -z|--zero
++ end each path with a NUL character instead of a newline, for paths that
++ may contain newlines. Paths are printed as they are, without any escaping
++ or quoting. Errors still go to standard error as text.
+
+-logical-resolve [-Pvo] [-s <bufsize>] <logical> <path>
++logical-resolve [-Pvoz] [-s <bufsize>] <logical> <path>
+ (needs root privileges)
+
+ resolve paths to all files at given *logical* address in the linear filesystem space
+@@ -168,6 +172,11 @@ logical-resolve [-Pvo] [-s <bufsize>] <logical> <path>
+ (added in 4.15).
+ -v
+ (deprecated) alias for global *-v* option
++ -z|--zero
++ end each line of output (each path, or each inode with *-P*) with a NUL
++ character instead of a newline, for paths that may contain newlines. Paths
++ are printed as they are, without any escaping or quoting. Errors still go
++ to standard error as text.
+
+ list-chunks [options] <path>
+ (needs root privileges)
+diff --git a/cmds/inspect.c b/cmds/inspect.c
+index e1ad1579..53532b90 100644
+--- a/cmds/inspect.c
++++ b/cmds/inspect.c
+@@ -94,12 +94,15 @@ static const char *ino_path(const char *pathbuf, int i)
+ return (const char *)(unsigned long)ptr;
+ }
+
++/* What ends each line of output, '\0' with -z */
++static char line_end = '\n';
++
+ static void print_ino_path(const char *prepend, const char *str)
+ {
+ if (prepend)
+- pr_default("%s/%s\n", prepend, str);
++ pr_default("%s/%s%c", prepend, str, line_end);
+ else
+- pr_default("%s\n", str);
++ pr_default("%s%c", str, line_end);
+ }
+
+ static int __ino_to_path_fd(u64 inum, int fd, const char *prepend)
+@@ -120,10 +123,12 @@ static int resolve_ino_paths(int fd, const char *arg, const char *arg_fs_path,
+ const u8 *fsid, u64 root, u64 inum);
+
+ static const char * const cmd_inspect_inode_resolve_usage[] = {
+- "btrfs inspect-internal inode-resolve [-v] <inode> <path>",
++ "btrfs inspect-internal inode-resolve [-vz] <inode> <path>",
+ "Get file system paths for the given inode",
+ "",
+ OPTLINE("-v", "deprecated, alias for global -v option"),
++ OPTLINE("-z, --zero", "end each path with a NUL character instead of a newline, "
++ "without any escaping"),
+ HELPINFO_INSERT_GLOBALS,
+ HELPINFO_INSERT_VERBOSE,
+ NULL
+@@ -143,7 +148,12 @@ static int cmd_inspect_inode_resolve(const struct cmd_struct *cmd,
+
+ optind = 0;
+ while (1) {
+- int c = getopt(argc, argv, "v");
++ static const struct option long_options[] = {
++ { "zero", no_argument, NULL, 'z' },
++ { NULL, 0, NULL, 0 }
++ };
++ int c = getopt_long(argc, argv, "vz", long_options, NULL);
++
+ if (c < 0)
+ break;
+
+@@ -151,6 +161,9 @@ static int cmd_inspect_inode_resolve(const struct cmd_struct *cmd,
+ case 'v':
+ bconf_be_verbose();
+ break;
++ case 'z':
++ line_end = '\0';
++ break;
+ default:
+ usage_unknown_option(cmd, argv);
+ }
+@@ -572,7 +585,7 @@ out:
+ }
+
+ static const char * const cmd_inspect_logical_resolve_usage[] = {
+- "btrfs inspect-internal logical-resolve [-Pvo] [-s bufsize] <logical> <path>",
++ "btrfs inspect-internal logical-resolve [-Pvoz] [-s bufsize] <logical> <path>",
+ "Get file system paths for the given logical address",
+ "",
+ OPTLINE("-P", "skip the path resolving and print the inodes instead"),
+@@ -582,6 +595,8 @@ static const char * const cmd_inspect_logical_resolve_usage[] = {
+ "resolved results. The max value one can set is 64k with the "
+ "v1 ioctl. Sizes over 64k will use the v2 ioctl (kernel 4.15+)"),
+ OPTLINE("-v", "deprecated, alias for global -v option"),
++ OPTLINE("-z, --zero", "end each line of output (path, or inode with -P) with a NUL "
++ "character instead of a newline, without any escaping"),
+ HELPINFO_INSERT_GLOBALS,
+ HELPINFO_INSERT_VERBOSE,
+ NULL
+@@ -604,7 +619,12 @@ static int cmd_inspect_logical_resolve(const struct cmd_struct *cmd,
+
+ optind = 0;
+ while (1) {
+- int c = getopt(argc, argv, "Pvos:");
++ static const struct option long_options[] = {
++ { "zero", no_argument, NULL, 'z' },
++ { NULL, 0, NULL, 0 }
++ };
++ int c = getopt_long(argc, argv, "Pvos:z", long_options, NULL);
++
+ if (c < 0)
+ break;
+
+@@ -621,6 +641,9 @@ static int cmd_inspect_logical_resolve(const struct cmd_struct *cmd,
+ case 's':
+ size = arg_strtou64(optarg);
+ break;
++ case 'z':
++ line_end = '\0';
++ break;
+ default:
+ usage_unknown_option(cmd, argv);
+ }
+@@ -686,8 +709,8 @@ static int cmd_inspect_logical_resolve(const struct cmd_struct *cmd,
+ int ret2;
+
+ if (!getpath) {
+- pr_default("inode %llu offset %llu root %llu\n", inum,
+- offset, root);
++ pr_default("inode %llu offset %llu root %llu%c", inum,
++ offset, root, line_end);
+ continue;
+ }
+
+diff --git a/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
+index 36987b4b..1823038c 100755
+--- a/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
++++ b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh
+@@ -202,6 +202,24 @@ check_logical_offset_exact()
+ fi
+ }
+
++# Resolve $1 with $2 as the path argument and -z: the output must be exactly
++# $3..., each followed by a NUL character
++check_logical_offset_zero()
++{
++ local offset="$1"
++ local path="$2"
++ local tmp
++
++ shift 2
++ tmp=$(_mktemp logical-resolve-zero)
++ run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ logical-resolve -z "$offset" "$path" > "$tmp"
++ if ! printf '%s\0' "$@" | cmp -s - "$tmp"; then
++ _fail "logical-resolve -z $offset $path did not print exactly: $*"
++ fi
++ rm -f -- "$tmp"
++}
++
+ # Mount points and mounted directories with special characters: mnt6 is a
+ # bind mount of the odd directory of subvol2 at an odd mount point, mnt7
+ # the unrelated subvol1, then mnt8 subvol2 itself at an odd mount point
+@@ -213,6 +231,18 @@ run_check_umount_test_dev "$TEST_MNT"
+ for offset in $file6offsets; do
+ check_logical_offset_exact "$offset" "mnt6 $odd" "mnt6 $odd/file6"
+ check_logical_offset_exact "$offset" mnt7 "$PWD/mnt6 $odd/file6"
++ check_logical_offset_zero "$offset" "mnt6 $odd" "mnt6 $odd/file6"
++ check_logical_offset_zero "$offset" mnt7 "$PWD/mnt6 $odd/file6"
++ # -P -z: the same records as -P, each ended by NUL instead of newline
++ lines=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ logical-resolve -P "$offset" mnt7 | wc -l)
++ nuls=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ logical-resolve -P -z "$offset" mnt7 | tr -cd '\0' | wc -c)
++ newlines=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ logical-resolve -P -z "$offset" mnt7 | tr -cd '\n' | wc -c)
++ if [ "$lines" -eq 0 ] || [ "$nuls" -ne "$lines" ] || [ "$newlines" -ne 0 ]; then
++ _fail "logical-resolve -P -z $offset: $nuls NULs, $newlines newlines, $lines lines"
++ fi
+ done
+ run_check $SUDO_HELPER mount -o subvol=/@/vol1/bdir/sub/subvol2 "$TEST_DEV" "mnt8 $odd"
+ for offset in $file6offsets; do
+diff --git a/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh b/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
+index 0e46e4b8..5aee3f62 100755
+--- a/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
++++ b/tests/misc-tests/074-inspect-internal-inode-resolve/test.sh
+@@ -50,6 +50,24 @@ check_inode_resolve()
+ fi
+ }
+
++# Resolve inode $1 with $2 as the path argument and -z: the paths printed,
++# each followed by a NUL character, must be exactly $3... in any order
++check_inode_resolve_zero()
++{
++ local ino="$1"
++ local path="$2"
++ local tmp
++
++ shift 2
++ tmp=$(_mktemp inode-resolve-zero)
++ run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal \
++ inode-resolve -z "$ino" "$path" > "$tmp"
++ if ! cmp -s <(printf '%s\0' "$@" | sort -z) <(sort -z "$tmp"); then
++ _fail "inode-resolve -z $ino $path did not print exactly: $*"
++ fi
++ rm -f -- "$tmp"
++}
++
+ run_check_mkfs_test_dev
+ run_check_mount_test_dev
+ run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/vol"
+@@ -83,6 +101,15 @@ check_inode_resolve "$ino" "$bind1" 0 "$bind1/sub/file" \
+ check_inode_resolve "$ino" "$TEST_MNT/idir/sub" 0 "$TEST_MNT/idir/sub/file" \
+ "$TEST_MNT/ldir/link" "$TEST_MNT/link"
+
++# With -z, names with a newline and a space are printed as they are
++name=$'new\nline and space'
++run_check $SUDO_HELPER ln "$TEST_MNT/idir/sub/file" "$TEST_MNT/ldir/$name"
++check_inode_resolve_zero "$ino" "$TEST_MNT" "$TEST_MNT/idir/sub/file" \
++ "$TEST_MNT/ldir/link" "$TEST_MNT/link" "$TEST_MNT/ldir/$name"
++check_inode_resolve_zero "$ino" "$bind1" "$bind1/sub/file" \
++ "$TEST_MNT/ldir/link" "$TEST_MNT/link" "$TEST_MNT/ldir/$name"
++run_check $SUDO_HELPER rm -- "$TEST_MNT/ldir/$name"
++
+ # Without it, through the bind mount of the directory they are in, if any
+ run_check_umount_test_dev "$TEST_MNT"
+ check_inode_resolve "$ino" "$bind1" 1 "$bind1/sub/file" "$bind2/link"
+--
+2.47.3
+
# Testing: logical-resolve-fixes
-Four patches on devel 9d01fb77 (btrfs-progs Issue #400):
+Five patches on devel 9d01fb77 (btrfs-progs Issue #400):
1. 4bd84e5a mountinfo optional fields;
2. 0d145ccc subvolume lookup: four routes, per path, including bind
mounts of directories inside the subvolume;
3. 3f2c3c53 inode-resolve through the same routes (with the new
misc-tests/074-inspect-internal-inode-resolve);
-4. bed8b5eb unreachable reference or path = error (with the
- misc-tests/042 update, including its bind mount cases, and the 074
- update).
+4. a4893e1e unreachable reference or path = error (with the
+ misc-tests/042 update, including its bind mount and escaped-name
+ cases, and the 074 update);
+5. 85ca1f91 -z/--zero NUL-terminated output for both commands (feature).
Rows older than 2026-10-30 "bind2" ran earlier versions of patches 2-4
(see Lane SHAs); their results are kept for the history.
| test | verifies | patch(es) | last result | date | progs | harness | evidence |
|---|---|---|---|---|---|---|---|
+| `logical-resolve-repro.sh` esc-* (a directory and mount points named with a space, tab, newline and backslash: the bind as argument, route 4 through it, route 3 through the top level at an odd mount point), plain output must equal the path and `-z` output the path + NUL; whole run with the previous topic (bed8b5eb, +lr0) side by side | escapes decoded, -z exact | 1, 2, 5 | 170 pairs: 167 identical, 3 changed (the esc lines, `z=MISSING` -> `z=ok`: the old build has no -z; its plain output was already exact). v6.14 and v7.1 fail all three (`.../odd.../odd.../fo` or `ino paths ioctl`) | 2026-10-31 | v6.14, v7.1, bed8b5eb, 85ca1f91 | 85c2a204 | `esc/run-ahive-esc-85ca1f91.txt`, `esc/repro-diff-lr0-vs-lr-85ca1f91.txt` |
+| misc-tests 042 escaped names (patch 4): subvol2 directory `odd \t\n\\dir` bound at `mnt6 <odd>`, subvol1 at mnt7, subvol2 at `mnt8 <odd>`; exact output through route 2, 4 and 3; with patch 5 the same with `-z`, and `-P -z` gives as many NULs as `-P` lines and no newline | escapes, -z | 4, 5 | PASS at a4893e1e, 85ca1f91, testing d541f776. Control: the bed8b5eb binary passes the escape cases and fails only at `-z` (invalid option) | 2026-10-31 | a4893e1e, 85ca1f91, d541f776 | 85c2a204 | `esc/misc-042-*.txt` |
+| misc-tests 074 -z (patch 5): a fourth hard link named `new\nline and space`, all names compared NUL-separated (sorted), from the subvolume root and from the bind of idir | -z | 5 | PASS at 85ca1f91, testing d541f776. Control: bed8b5eb binary fails (invalid option) | 2026-10-31 | 85ca1f91, d541f776 | 85c2a204 | `esc/misc-074-*.txt` |
+| bisect "esc": 042 and 074 at patches 4 and 5 (1-3 unchanged since bind2) | | 4, 5 | PASS | 2026-10-31 | a4893e1e, 85ca1f91 | 85c2a204 | `esc/progs-tests-ahive-bisect.txt` |
| `logical-resolve-repro.sh`, whole run with the previous topic (da97c420, +lr0) and this one (+lr) side by side; new layouts brename (bound /dir renamed), bdel (bound empty dir deleted, alone and with another bind), bover (/dir renamed over a bound empty dir), bcross (bind inside nested sv3 must not serve root 5), hlink/hlink2 (hard link outside the bound argument, with and without the top level mounted) | only references that were "not mounted", and partial hard-link sets, change | 2-4 | 167 paired lines: 155 identical, 12 changed: 6 "not mounted" now resolved through a bind (bind1u, brename, bdel with `$M2`: `$M5/fd`), 6 hard-link cases (hlink: `$M/fdlink` now printed, rc 0; hlink2: `path fdlink ... not mounted` on stderr, rc 1, was silently dropped; inode-resolve the same). want= lines: topic 69/69, previous 60/69, v6.14 and v7.1 3/69. bover/bdel/bcross: no path printed, "not mounted" | 2026-10-30 | v6.14, v7.1, da97c420, bed8b5eb | ec655bda | `bind2/run-ahive-bind2-bed8b5eb.txt`, `bind2/repro-diff-lr0-vs-lr-bed8b5eb.txt` |
| misc-tests 074-inspect-internal-inode-resolve (patch 3, updated by 4): vol mounted subvol=/vol; the subvolume root, a directory in it, "." in it, a bind of idir and a directory in it; then links in ldir and at the root: from the root all three, from the bind of idir the others through the mount of vol; with vol unmounted and binds of idir and ldir, ldir/link through the bind of ldir and the root link not mounted | exact path set, number of not-mounted paths, exit status | 3, 4 | PASS at 3f2c3c53 (10 runs, rc 0: patch 3 prints the message on stdout) and at bed8b5eb and testing a32d9351 (10 runs, 2 with rc 1). Control: the da97c420 binary FAILS (`$TEST_MNT/ldir/link`, `$TEST_MNT/link` not printed from the bind) | 2026-10-30 | 3f2c3c53, bed8b5eb, testing a32d9351 | ec655bda | `bind2/misc-074-*.txt` |
| misc-tests 042, bind section, new case: argument mnt5 (bind of a directory of subvol2), file3 of vol1 reached through the bind of its directory as `$PWD/mnt4/file3` | route 4 | 2, 4 | PASS at bed8b5eb and testing a32d9351. Control: the da97c420 binary FAILS at it | 2026-10-30 | bed8b5eb, a32d9351 | ec655bda | `bind2/misc-042-*.txt` |
| cli-tests 008-subvolume-get-set-default | PASS | 2026-10-30 | testing 25b77be8 | same |
| misc 042, 024, 013, 040, 043, 055, cli 008, with patch 3 | PASS | 2026-10-30 | topic da97c420, testing 14c065a7 | `progs-tests-ahive-{topic-da97c420,testing-14c065a7}.txt` |
| misc 042, 074, 024, 013, 040, 043, 055, cli 008 ("bind2") | PASS | 2026-10-30 | topic bed8b5eb, testing a32d9351 | `bind2/progs-tests-ahive-bisect-and-testing.txt` |
+| same ("esc") | PASS | 2026-10-31 | topic 85ca1f91, testing d541f776 | `esc/progs-tests-ahive-*.txt` |
`make testsuite` was not built on ahive at the time (fsstress needs
liburing, which ahive did not have); `make all` and `TEST=...
## Lane SHAs
+- 2026-10-31 "esc" (Zygo: unescape mount points; add -z/-0): the
+ mountinfo parser already decodes octal escapes (read_path(), from
+ e31679c1), so no code change; escaped-name cases added to 042 in patch
+ 4 (bed8b5eb -> a4893e1e, dates kept). New patch 5 85ca1f91 (-z,
+ --zero). testing a32d9351 -> d541f776, same parents; tree = oracle =
+ real merge. Backups refs/backup/progs-20261031-esc/.
- 2026-10-30 "bind2" (Zygo: implement the non-root-bind route in patch 2;
report hard links outside the argument only if no route reaches them,
inode-resolve too; inode-resolve cases into a new misc test): 2147f7bb
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|
- Bind mounts of directories inside a subvolume are used for the paths
below them only, never as the mount of the whole subvolume (wrongfs:
`/sv1/bdir` mounted first still loses to the subvol=/sv1 mount).
-- Mount points with escaped characters in mountinfo (`\040` for a space)
- are not unescaped by iterate_btrfs_mounts(), so those mounts are not
- used by any mount route (pre-existing, not changed).
- The paths of one inode come from one INO_PATHS call of PATH_MAX bytes,
as before; an inode with more names than fit loses the rest silently
(pre-existing).
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|
From c6bdae69281400698579562f59ef003b323cf7f6 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
-Date: Fri, 30 Oct 2026 18:58:57 -0400
+Date: Fri, 30 Oct 2026 20:38:10 -0400
Subject: [PATCH 0/2] btrfs-progs: scrub: leave the device limits alone without --limit
To: linux-btrfs@vger.kernel.org
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|
From 37cc6ecb63f75d08913183387116f1ea7ecc05e0 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
-Date: Fri, 30 Oct 2026 18:58:57 -0400
+Date: Fri, 30 Oct 2026 20:38:10 -0400
Subject: [PATCH 0/2] btrfs-progs: scrub: progress socket fixes
To: linux-btrfs@vger.kernel.org
BTRFS_ASSERT). Evidence: raid56-wh-harness
`forensics/progs-testsuite-20261030/SUMMARY.md` (harness b243013).
-3bc81a49 differs from the current `testing` a32d9351 in four ways,
+3bc81a49 differs from the current `testing` d541f776 in five ways,
all in logical-resolve-fixes: it still had the arg_strtou64() hex patch
that was since dropped, and the collapsed misc-tests/042 line that was
since restored; and it predates the fix for a path argument inside a
subvolume (e.g. a bind-mounted directory) and the bind mount cases of
-misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route.
+misc-tests/042 (2026-10-30); and it predates the inode-resolve patch, misc-tests/074 and the bind mount route; and it has no -z.
| suite | pass | not run | fail |
|---|---|---|---|