summaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorChristophe Vu-Brugier <cvubrugier@yahoo.fr>2014-06-06 17:15:15 +0200
committerNicholas Bellinger <nab@linux-iscsi.org>2014-06-06 14:21:00 -0700
commit9aff64e13f3678015c4a08a4fbf320b3a65b5cf1 (patch)
treec527bc4b589fe9e80f3673d4cc6a84bf747ce84f /drivers/target
parent6dbe7f4e97d55eefcb471c41c16b62fca5f10c68 (diff)
downloadop-kernel-dev-9aff64e13f3678015c4a08a4fbf320b3a65b5cf1.zip
op-kernel-dev-9aff64e13f3678015c4a08a4fbf320b3a65b5cf1.tar.gz
target/spc: Simplify INQUIRY EVPD=0x80
Signed-off-by: Christophe Vu-Brugier <cvubrugier@yahoo.fr> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_spc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 8653666..17b5b7e 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -129,15 +129,10 @@ static sense_reason_t
spc_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf)
{
struct se_device *dev = cmd->se_dev;
- u16 len = 0;
+ u16 len;
if (dev->dev_flags & DF_EMULATED_VPD_UNIT_SERIAL) {
- u32 unit_serial_len;
-
- unit_serial_len = strlen(dev->t10_wwn.unit_serial);
- unit_serial_len++; /* For NULL Terminator */
-
- len += sprintf(&buf[4], "%s", dev->t10_wwn.unit_serial);
+ len = sprintf(&buf[4], "%s", dev->t10_wwn.unit_serial);
len++; /* Extra Byte for NULL Terminator */
buf[3] = len;
}
OpenPOWER on IntegriCloud