[2/3] target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag

Submitted by Andrei Vagin on Feb. 26, 2018, 10:41 p.m.

Details

Message ID 1519684877-3311-2-git-send-email-avagin@openvz.org
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrei Vagin Feb. 26, 2018, 10:41 p.m.
[This sender failed our fraud detection checks and may not be who they appear to be. Learn about spoofing at http://aka.ms/LearnAboutSpoofing]

From: Christoph Hellwig <hch@lst.de>

Here is a backport of the mainline commit:
ML: c3d0a7c21db219ef87679c2a667aba9f138524db

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---
 drivers/target/target_core_xcopy.c | 4 ++--
 include/target/target_core_base.h  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--
1.8.3.1

Patch hide | download patch | download mbox

diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 1d2421a..a7c8974 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -561,7 +561,7 @@  static int target_xcopy_init_pt_lun(
         * target_xcopy_setup_pt_port()
         */
        if (!remote_port) {
-               pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD | SCF_CMD_XCOPY_PASSTHROUGH;
+               pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
                return 0;
        }

@@ -569,7 +569,7 @@  static int target_xcopy_init_pt_lun(
        pt_cmd->se_dev = se_dev;

        pr_debug("Setup emulated se_dev: %p from se_dev\n", pt_cmd->se_dev);
-       pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD | SCF_CMD_XCOPY_PASSTHROUGH;
+       pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;

        pr_debug("Setup emulated se_dev: %p to pt_cmd->se_lun->lun_se_dev\n",
                pt_cmd->se_lun->lun_se_dev);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 7b6699c..196d4df 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -171,8 +171,7 @@  enum se_cmd_flags_table {
        SCF_ACK_KREF                    = 0x00040000,
        SCF_COMPARE_AND_WRITE           = 0x00080000,
        SCF_COMPARE_AND_WRITE_POST      = 0x00100000,
-       SCF_CMD_XCOPY_PASSTHROUGH       = 0x00200000,
-       SCF_PASSTHROUGH_PROT_SG_TO_MEM_NOALLOC = 0x00400000,
+       SCF_PASSTHROUGH_PROT_SG_TO_MEM_NOALLOC = 0x00200000,
 };

 /* struct se_dev_entry->lun_flags and struct se_lun->lun_access */