diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-20 23:10:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-20 23:10:12 +0000 |
| commit | 3efb3c04b80206d986b51767e6b879119d219e42 (patch) | |
| tree | 1dc83a1d5ba52b1e6b3e792ea1dae4f9e7353186 /sys-fs | |
| parent | be675f929577458bd306c90ed78b62054197c0b1 (diff) | |
gentoo auto-resync : 20:11:2023 - 23:10:12
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/Manifest.gz | bin | 22216 -> 22219 bytes | |||
| -rw-r--r-- | sys-fs/btrfs-progs/Manifest | 1 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch | 32 |
3 files changed, 0 insertions, 33 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 345f2e1e5176..dfb207a9f9ab 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index f3559c906fac..8a9508594b6e 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,4 +1,3 @@ -AUX btrfs-progs-6.6-fix-ioctl-typo.patch 1425 BLAKE2B f4f7cda4ee38a18d7e9722c30a2f9e0893b4dc544cd8148b9466a6cbda3c115db117d7723bf6591727a92ad0eb208abfcf2d12873d9ba8990d775fb4dbefecc8 SHA512 82db2c041565b97fa2deda1af109cb9f4e3dd8701109f6eef6635352f9e16dedf7c7e87f8eb132c09deab0422854b9e2aba07101308050dfc77c688473694b66 DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d4cfb6779985036610651a267fcf92299c140f99f2372278cafcb02f651413c069314195b7bd44d56ddf60eb60e5532d SHA512 e72791fd91cc9a93aaab72bf8c36f9d7e2608315ccb3b0474ca0c1e1893465b2c7145ce523216accb0d02c4dd0fd13597702ce6a8b9c2ac137cd9bce3c5a4347 DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672 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 deleted file mode 100644 index a06b6bac6754..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch +++ /dev/null @@ -1,32 +0,0 @@ -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) - |