aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2014-11-17 08:25:19 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-24 14:01:40 -0500
commiteb846d9f147455e4e5e1863bfb5e31974bb69b7c (patch)
tree443efbb146c7824508be817923bab04c2185810e /drivers/target
parent3af6b35261182ff185db1f0fd271254147e2663e (diff)
scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16
SPC-3 defines SERVICE ACTION IN(12) and SERVICE ACTION IN(16). So rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16 to be consistent with SPC and to allow for better distinction. Signed-off-by: Hannes Reinecke <hare@suse.de> Tested-by: Robert Elliott <elliott@hp.com> Reviewed-by: Robert Elliott <elliott@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_alua.c2
-rw-r--r--drivers/target/target_core_sbc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index fb87780929d2..75cbde1f7c5b 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -576,7 +576,7 @@ static inline int core_alua_state_standby(
576 case SEND_DIAGNOSTIC: 576 case SEND_DIAGNOSTIC:
577 case READ_CAPACITY: 577 case READ_CAPACITY:
578 return 0; 578 return 0;
579 case SERVICE_ACTION_IN: 579 case SERVICE_ACTION_IN_16:
580 switch (cdb[1] & 0x1f) { 580 switch (cdb[1] & 0x1f) {
581 case SAI_READ_CAPACITY_16: 581 case SAI_READ_CAPACITY_16:
582 return 0; 582 return 0;
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index ebe62afb957d..8d171ff77e75 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -852,7 +852,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
852 size = READ_CAP_LEN; 852 size = READ_CAP_LEN;
853 cmd->execute_cmd = sbc_emulate_readcapacity; 853 cmd->execute_cmd = sbc_emulate_readcapacity;
854 break; 854 break;
855 case SERVICE_ACTION_IN: 855 case SERVICE_ACTION_IN_16:
856 switch (cmd->t_task_cdb[1] & 0x1f) { 856 switch (cmd->t_task_cdb[1] & 0x1f) {
857 case SAI_READ_CAPACITY_16: 857 case SAI_READ_CAPACITY_16:
858 cmd->execute_cmd = sbc_emulate_readcapacity_16; 858 cmd->execute_cmd = sbc_emulate_readcapacity_16;