From 0ea1851ee2d492c70113537b9c57b7aad3a09053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8E=BD=E4=B8=8D=E7=BE=81?= <9704838+Fwind43@user.noreply.gitee.com> Date: Tue, 28 May 2024 10:49:04 +0000 Subject: [PATCH] fix(mgr): TypeError MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 鎽不羁 <9704838+Fwind43@user.noreply.gitee.com> --- 0009-fix-CVE-2022-0670.patch | 2 +- ceph.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/0009-fix-CVE-2022-0670.patch b/0009-fix-CVE-2022-0670.patch index a9c947f..2bacb5f 100644 --- a/0009-fix-CVE-2022-0670.patch +++ b/0009-fix-CVE-2022-0670.patch @@ -90,7 +90,7 @@ index 2840a9f2e..0d183e612 100644 def state(self): """ Subvolume state, one of SubvolumeStates """ - raise NotImplementedError -+ raise SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) ++ return SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) @property def subvol_type(self): diff --git a/ceph.spec b/ceph.spec index ce09d99..7ed3a14 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 20 +Release: 21 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -2505,6 +2505,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Tue May 28 2024 fwind43 - 2:16.2.7-21 +- fix error for cephfs subvolume + * Fri Mar 22 2024 lizhipeng - 2:16.2.7-20 - fix CVE-2023-46159 -- Gitee