aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-11-05 20:13:07 +0000
committerDavid Sterba <dsterba@suse.com>2023-11-05 23:10:28 +0100
commit8a687cf954ab884197e72c06564ffbdd11f4c38b (patch)
treec1dedfcfbc14f5abef38a1e4b1cb38d9cd9ab0da
parentf99258456fde79d769c769119307dca00e0e9e5a (diff)
downloadbtrfs-progs-8a687cf954ab884197e72c06564ffbdd11f4c38b.tar.gz
kernel-shared: uapi: fix BTRFS_IOC_SCAN_DEV defiintion
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) Issue: #704 Pull-request: #706 Reported-by: Atemu <atemu.main@gmail.com> Bug: https://github.com/NixOS/nixpkgs/issues/265668 Author: Sergei Trofimovich <slyich@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--kernel-shared/uapi/btrfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-shared/uapi/btrfs.h b/kernel-shared/uapi/btrfs.h
index fb24c5f7..34e84b89 100644
--- 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)