!22 target: remove the reference to MAX_LUN
From: @yanyan11222 Reviewed-by: @wk333 Signed-off-by: @wk333
This commit is contained in:
commit
106115ec6b
43
remove-reference-to-MAX_LUN.patch
Normal file
43
remove-reference-to-MAX_LUN.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From 4424eba4ba9f5c66c0cd8691fd4aad87ee19640f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maurizio Lombardi <mlombard@redhat.com>
|
||||||
|
Date: Thu, 19 Oct 2023 14:15:54 +0200
|
||||||
|
Subject: [PATCH] target: remove the reference to MAX_LUN
|
||||||
|
|
||||||
|
The MappedLUN.MAX_LUN symbol has been removed from rtslib.
|
||||||
|
Remove the reference to it.
|
||||||
|
|
||||||
|
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
targetcli/ui_target.py | 15 +++++----------
|
||||||
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
|
||||||
|
index e8ba6c6..2c46765 100644
|
||||||
|
--- a/targetcli/ui_target.py
|
||||||
|
+++ b/targetcli/ui_target.py
|
||||||
|
@@ -1146,16 +1146,11 @@ class UILUNs(UINode):
|
||||||
|
mapped_lun = 0
|
||||||
|
existing_mluns = [mlun.mapped_lun for mlun in acl.mapped_luns]
|
||||||
|
if mapped_lun in existing_mluns:
|
||||||
|
- mapped_lun = None
|
||||||
|
- for possible_mlun in six.moves.range(MappedLUN.MAX_LUN):
|
||||||
|
- if possible_mlun not in existing_mluns:
|
||||||
|
- mapped_lun = possible_mlun
|
||||||
|
- break
|
||||||
|
-
|
||||||
|
- if mapped_lun == None:
|
||||||
|
- self.shell.log.warning(
|
||||||
|
- "Cannot map new lun %s into ACL %s"
|
||||||
|
- % (lun_object.lun, acl.node_wwn))
|
||||||
|
+ possible_mlun = 0
|
||||||
|
+ while possible_mlun in existing_mluns:
|
||||||
|
+ possible_mlun += 1
|
||||||
|
+ mapped_lun = possible_mlun
|
||||||
|
+
|
||||||
|
else:
|
||||||
|
mlun = MappedLUN(acl, mapped_lun, lun_object, write_protect=False)
|
||||||
|
self.shell.log.info("Created LUN %d->%d mapping in node ACL %s"
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -2,9 +2,10 @@ Name: targetcli
|
|||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Summary: Generic SCSI target CLI shell
|
Summary: Generic SCSI target CLI shell
|
||||||
Version: 2.1.56
|
Version: 2.1.56
|
||||||
Release: 1
|
Release: 2
|
||||||
URL: https://github.com/open-iscsi/targetcli-fb
|
URL: https://github.com/open-iscsi/targetcli-fb
|
||||||
Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz
|
Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz
|
||||||
|
Patch01: remove-reference-to-MAX_LUN.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python3-devel python3-setuptools systemd
|
BuildRequires: python3-devel python3-setuptools systemd
|
||||||
Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject-base
|
Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject-base
|
||||||
@ -20,7 +21,7 @@ Summary: Help document for the %{name} package
|
|||||||
Help document for the %{name} package.
|
Help document for the %{name} package.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n targetcli-fb-%{version}
|
%autosetup -n targetcli-fb-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
@ -47,6 +48,9 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/
|
|||||||
%{_mandir}/man8/targetcli*.8*
|
%{_mandir}/man8/targetcli*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 8 2024 yanshuai <yanshuai@kylinos.cn> - 2.1.56-2
|
||||||
|
- remove the reference to MAX_LUN
|
||||||
|
|
||||||
* Mon Jul 24 2023 zhangchenglin <zhangchenglin@kylinos.cn> - 2.1.56-1
|
* Mon Jul 24 2023 zhangchenglin <zhangchenglin@kylinos.cn> - 2.1.56-1
|
||||||
- upgrade version to 2.1.56
|
- upgrade version to 2.1.56
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user