From 88219193b890cf281c42bc99ee4a29250c2cc1be Mon Sep 17 00:00:00 2001 From: zhujun2 Date: Wed, 14 Jun 2023 16:52:46 +0800 Subject: [PATCH] blkid: solve a bug that the disk device of the ceph_bluestore file system, the disk by-partlabel probability loss problem Signed-off-by: zhujun2 --- ...luestore-dev-by-partlabel-loss-error.patch | 30 +++++++++++++++++++ util-linux.spec | 9 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 blkid-fix-ceph_bluestore-dev-by-partlabel-loss-error.patch diff --git a/blkid-fix-ceph_bluestore-dev-by-partlabel-loss-error.patch b/blkid-fix-ceph_bluestore-dev-by-partlabel-loss-error.patch new file mode 100644 index 0000000..35bd3d4 --- /dev/null +++ b/blkid-fix-ceph_bluestore-dev-by-partlabel-loss-error.patch @@ -0,0 +1,30 @@ +From 4a558f289cd83c993fdb4610aa564f2f4220bca3 Mon Sep 17 00:00:00 2001 +From: zhujun2 +Date: Wed, 14 Jun 2023 15:45:49 +0800 +Subject: [PATCH] blkid: solve a bug that the disk device of the ceph_bluestore + file system, the disk by-partlabel probability loss problem + +Signed-off-by: zhujun2 +--- + libblkid/src/superblocks/xfs.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c +index d8c6fb6..3686bd5 100644 +--- a/libblkid/src/superblocks/xfs.c ++++ b/libblkid/src/superblocks/xfs.c +@@ -259,6 +259,11 @@ static int probe_xfs_log(blkid_probe pr, + if (memcmp(&buf[i*512], "XFSB", 4) == 0) + return 1; + ++ if (memcmp(&buf[i*512], "bluestore block device", 22) == 0) { ++ DBG(LOWPROBE, ul_debug("\t device has ceph_bluestore ambivalent")); ++ return 1; ++ } ++ + rhead = (struct xlog_rec_header *)&buf[i*512]; + + if (xlog_valid_rec_header(rhead)) { +-- +2.20.1 + diff --git a/util-linux.spec b/util-linux.spec index 5839f37..0817452 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Name: util-linux Version: 2.35.2 -Release: 12 +Release: 13 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -62,6 +62,7 @@ Patch6001: backport-add-ul_strtou64.patch Patch6002: backport-CVE-2021-3995.patch Patch6003: backport-CVE-2021-3996.patch Patch6004: backport-prlimit-fix-optional-arguments-parsing.patch +Patch6005: blkid-fix-ceph_bluestore-dev-by-partlabel-loss-error.patch Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch Patch9001: modify-rescuemode-chinese-error.patch @@ -410,6 +411,12 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Wed Jun 14 2023 zhujun - 2.35.2-13 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:solve a bug that disk device of ceph_bluestore file system,the disk by-partlabel probability loss problem + * Wed Sep 7 2022 Xiaole He - 2.35.2-12 - Type:bugfix - ID:NA -- Gitee