diff options
| author |   Sam James <sam@gentoo.org> | 2023-11-05 20:37:17 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-11-05 20:37:17 +0000 |
| commit | 0857fb0eb7f899970b8bcd787e521e351c1502af (patch) | |
| tree | 32996330afcd96bbf0a4dae2df4173f6cc3c1322 /sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch | |
| parent | dev-python/mkdocs-material: Stabilize 9.4.7 ALLARCHES, #916920 (diff) | |
| download | gentoo-0857fb0eb7f899970b8bcd787e521e351c1502af.tar.gz gentoo-0857fb0eb7f899970b8bcd787e521e351c1502af.tar.bz2 gentoo-0857fb0eb7f899970b8bcd787e521e351c1502af.zip | |
sys-fs/btrfs-progs: fix bad ioctl definition in 6.6
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch')
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch new file mode 100644 index 000000000000..a06b6bac6754 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch @@ -0,0 +1,32 @@ +https://github.com/kdave/btrfs-progs/pull/706 + +From 027a08d659033e3b892760bfd4c19c6db9e9fa3f Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 5 Nov 2023 20:13:07 +0000 +Subject: [PATCH] kernel-shared/uapi/btrfs.h: fix BTRFS_IOC_SCAN_DEV + +Without the change `BTRFS_IOC_SCAN_DEV` aliased with `BTRFS_IOC_FORGET_DEV`. +It's a regression introduced in fcd9142b6 "btrfs-progs: docs: formatting, +fixups, updates". + +It manifests as a sudden device disappearance when device is scanned: + + machine # [ 4.095032] Btrfs loaded, crc32c=crc32c-intel, zoned=no, fsverity=no + machine # ERROR: device scan failed on '/dev/vdb': No such file or directory + machine # ERROR: device scan failed on '/dev/vdc': No such file or directory + (finished: must succeed: mkfs.btrfs -d raid0 /dev/vdb /dev/vdc, in 10.31 seconds) + +Reported-by: Atemu <atemu.main@gmail.com> +Bug: https://github.com/NixOS/nixpkgs/issues/265668 +--- a/kernel-shared/uapi/btrfs.h ++++ b/kernel-shared/uapi/btrfs.h +@@ -1171,7 +1171,7 @@ enum btrfs_err_code { + struct btrfs_ioctl_vol_args) + #define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \ + struct btrfs_ioctl_vol_args) +-#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \ ++#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \ + struct btrfs_ioctl_vol_args) + #define BTRFS_IOC_FORGET_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \ + struct btrfs_ioctl_vol_args) + |