From 28aaa7cf9548f135887c19038b432580587b52f9f933a7e1904f4be7641ba892 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Tue, 21 May 2019 10:08:17 +0000 Subject: [PATCH] Accepting request 704402 from home:dmdiss:bsc1121998_emulate_pr - support emulate_pr attribute changes (bsc#1121998) + Add-emulate_pr-backstore-attribute.patch - changelog: fix typo bsc#11234233 -> bsc#1123423 OBS-URL: https://build.opensuse.org/request/show/704402 OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=28 --- Add-emulate_pr-backstore-attribute.patch | 29 ++++++++++++++++++++++++ targetcli-fb.changes | 8 ++++++- targetcli-fb.spec | 4 +++- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Add-emulate_pr-backstore-attribute.patch diff --git a/Add-emulate_pr-backstore-attribute.patch b/Add-emulate_pr-backstore-attribute.patch new file mode 100644 index 0000000..fdabe8f --- /dev/null +++ b/Add-emulate_pr-backstore-attribute.patch @@ -0,0 +1,29 @@ +From fa71860b0d819a691683c1fdcb70c255653b5851 Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Tue, 15 Jan 2019 12:04:49 +0100 +Subject: [PATCH] Add emulate_pr backstore attribute + +Added to the kernel via b49d6f7885306ee636d5c1af52170f3069ccf5f7, the +emulate_pr attribute can be used to disable support for SCSI-2 +(RESERVE/RELEASE) and Persistent Reservations. + +Signed-off-by: David Disseldorp +--- + targetcli/ui_backstore.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py +index efa532f..cc2cf2b 100644 +--- a/targetcli/ui_backstore.py ++++ b/targetcli/ui_backstore.py +@@ -670,6 +670,7 @@ class UIStorageObject(UIRTSLibNode): + 'emulate_tpws': ('number', 'If set to 1, enable Thin Provisioning Write Same.'), + 'emulate_ua_intlck_ctrl': ('number', 'If set to 1, enable Unit Attention Interlock.'), + 'emulate_write_cache': ('number', 'If set to 1, turn on Write Cache Enable.'), ++ 'emulate_pr': ('number', 'If set to 1, enable SCSI Reservations.'), + 'enforce_pr_isids': ('number', 'If set to 1, enforce persistent reservation ISIDs.'), + 'force_pr_aptpl': ('number', 'If set to 1, force SPC-3 PR Activate Persistence across Target Power Loss operation.'), + 'fabric_max_sectors': ('number', 'Maximum number of sectors the fabric can transfer at once.'), +-- +2.16.4 + diff --git a/targetcli-fb.changes b/targetcli-fb.changes index 4d8131c..719f644 100644 --- a/targetcli-fb.changes +++ b/targetcli-fb.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 3 03:14:10 UTC 2019 - ddiss@suse.com + +- support emulate_pr attribute changes (bsc#1121998) + + Add-emulate_pr-backstore-attribute.patch + ------------------------------------------------------------------- Thu Feb 7 17:26:52 UTC 2019 - lduncan@suse.com - Ensure this package and the deprecated lio-utils package - do not run at the same time, in a sane way (bsc#11234233), + do not run at the same time, in a sane way (bsc#1123423), updating the source file targetcli-fb.service. Also, updated the SPEC file with new year, updated URL, and http->https. diff --git a/targetcli-fb.spec b/targetcli-fb.spec index 5f04550..c5b6fb4 100644 --- a/targetcli-fb.spec +++ b/targetcli-fb.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -56,6 +56,7 @@ Obsoletes: targetcli-rbd < %{version} %{?systemd_requires} Patch1: Split-out-blockdev-readonly-state-detection-helper.patch Patch2: rbd-support.patch +Patch3: Add-emulate_pr-backstore-attribute.patch %python_subpackages @@ -85,6 +86,7 @@ python2-targetcli-fb and python3-targetcli-fb. # RBD support is dependent on LIO changes present in the SLE/Leap kernel %patch2 -p1 %endif +%patch3 -p1 %build %python_build