[RHEL7,COMMIT] target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag

Submitted by Konstantin Khorenko on March 1, 2018, 8:15 a.m.

Details

Message ID 201803010815.w218FFnr007602@finist_ce7.work
State New
Series "target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag"
Headers show

Commit Message

Konstantin Khorenko March 1, 2018, 8:15 a.m.
The commit is pushed to "branch-rh7-3.10.0-693.17.1.vz7.45.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.17.1.vz7.45.6
------>
commit a7a74bd11447668ac9eff66cdbd9b99e74d526d9
Author: Christoph Hellwig <hch@lst.de>
Date:   Thu Mar 1 11:15:15 2018 +0300

    target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
    
    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>
    
    Signed-off-by: Andrei Vagin <avagin@openvz.org>
---
 drivers/target/target_core_xcopy.c | 4 ++--
 include/target/target_core_base.h  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 1d2421a126a3..a7c89740feb0 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 3b847b78bac8..288935002951 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 */