From 7dfcb3c6df765a094defcc1f28fb214dbf676e43 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 17 Jun 2012 18:40:51 -0400 Subject: [PATCH] --- yaml --- r: 312662 b: refs/heads/master c: e1306bdab3af8bef620990a99e613f99eb30065c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_transport.c | 1 - trunk/include/target/target_core_base.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2da74b80e5e8..9a8fbf6bc200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c75660c5e42c1a3edc4df0d062b2bd73e69dadb7 +refs/heads/master: e1306bdab3af8bef620990a99e613f99eb30065c diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c index 1c53fcec1133..82946962796d 100644 --- a/trunk/drivers/target/target_core_transport.c +++ b/trunk/drivers/target/target_core_transport.c @@ -1933,7 +1933,6 @@ static void target_execute_cmd(struct se_cmd *cmd) if (atomic_read(&dev->dev_ordered_sync) != 0) { spin_lock(&dev->delayed_cmd_lock); - cmd->se_cmd_flags |= SCF_DELAYED_CMD_FROM_SAM_ATTR; list_add_tail(&cmd->se_delayed_node, &dev->delayed_cmd_list); spin_unlock(&dev->delayed_cmd_lock); diff --git a/trunk/include/target/target_core_base.h b/trunk/include/target/target_core_base.h index 15039dd9de18..1ae97fe93d2f 100644 --- a/trunk/include/target/target_core_base.h +++ b/trunk/include/target/target_core_base.h @@ -166,14 +166,12 @@ enum se_cmd_flags_table { SCF_SCSI_RESERVATION_CONFLICT = 0x00000040, SCF_FUA = 0x00000080, SCF_SE_LUN_CMD = 0x00000100, - SCF_SE_ALLOW_EOO = 0x00000200, SCF_BIDI = 0x00000400, SCF_SENT_CHECK_CONDITION = 0x00000800, SCF_OVERFLOW_BIT = 0x00001000, SCF_UNDERFLOW_BIT = 0x00002000, SCF_SENT_DELAYED_TAS = 0x00004000, SCF_ALUA_NON_OPTIMIZED = 0x00008000, - SCF_DELAYED_CMD_FROM_SAM_ATTR = 0x00010000, SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00020000, SCF_ACK_KREF = 0x00040000, };