diff options
Diffstat (limited to 'drivers/target/target_core_cdb.c')
-rw-r--r-- | drivers/target/target_core_cdb.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c index 59219509d886..5c60d0a97a50 100644 --- a/drivers/target/target_core_cdb.c +++ b/drivers/target/target_core_cdb.c | |||
@@ -116,11 +116,9 @@ target_emulate_inquiry_std(struct se_cmd *cmd) | |||
116 | goto out; | 116 | goto out; |
117 | } | 117 | } |
118 | 118 | ||
119 | snprintf((unsigned char *)&buf[8], 8, "LIO-ORG"); | 119 | snprintf(&buf[8], 8, "LIO-ORG"); |
120 | snprintf((unsigned char *)&buf[16], 16, "%s", | 120 | snprintf(&buf[16], 16, "%s", dev->se_sub_dev->t10_wwn.model); |
121 | &dev->se_sub_dev->t10_wwn.model[0]); | 121 | snprintf(&buf[32], 4, "%s", dev->se_sub_dev->t10_wwn.revision); |
122 | snprintf((unsigned char *)&buf[32], 4, "%s", | ||
123 | &dev->se_sub_dev->t10_wwn.revision[0]); | ||
124 | buf[4] = 31; /* Set additional length to 31 */ | 122 | buf[4] = 31; /* Set additional length to 31 */ |
125 | 123 | ||
126 | out: | 124 | out: |
@@ -139,8 +137,7 @@ target_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf) | |||
139 | SDF_EMULATED_VPD_UNIT_SERIAL) { | 137 | SDF_EMULATED_VPD_UNIT_SERIAL) { |
140 | u32 unit_serial_len; | 138 | u32 unit_serial_len; |
141 | 139 | ||
142 | unit_serial_len = | 140 | unit_serial_len = strlen(dev->se_sub_dev->t10_wwn.unit_serial); |
143 | strlen(&dev->se_sub_dev->t10_wwn.unit_serial[0]); | ||
144 | unit_serial_len++; /* For NULL Terminator */ | 141 | unit_serial_len++; /* For NULL Terminator */ |
145 | 142 | ||
146 | if (((len + 4) + unit_serial_len) > cmd->data_length) { | 143 | if (((len + 4) + unit_serial_len) > cmd->data_length) { |
@@ -149,8 +146,8 @@ target_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf) | |||
149 | buf[3] = (len & 0xff); | 146 | buf[3] = (len & 0xff); |
150 | return 0; | 147 | return 0; |
151 | } | 148 | } |
152 | len += sprintf((unsigned char *)&buf[4], "%s", | 149 | len += sprintf(&buf[4], "%s", |
153 | &dev->se_sub_dev->t10_wwn.unit_serial[0]); | 150 | dev->se_sub_dev->t10_wwn.unit_serial); |
154 | len++; /* Extra Byte for NULL Terminator */ | 151 | len++; /* Extra Byte for NULL Terminator */ |
155 | buf[3] = len; | 152 | buf[3] = len; |
156 | } | 153 | } |
@@ -280,14 +277,13 @@ check_t10_vend_desc: | |||
280 | len += (prod_len + unit_serial_len); | 277 | len += (prod_len + unit_serial_len); |
281 | goto check_port; | 278 | goto check_port; |
282 | } | 279 | } |
283 | id_len += sprintf((unsigned char *)&buf[off+12], | 280 | id_len += sprintf(&buf[off+12], "%s:%s", prod, |
284 | "%s:%s", prod, | ||
285 | &dev->se_sub_dev->t10_wwn.unit_serial[0]); | 281 | &dev->se_sub_dev->t10_wwn.unit_serial[0]); |
286 | } | 282 | } |
287 | buf[off] = 0x2; /* ASCII */ | 283 | buf[off] = 0x2; /* ASCII */ |
288 | buf[off+1] = 0x1; /* T10 Vendor ID */ | 284 | buf[off+1] = 0x1; /* T10 Vendor ID */ |
289 | buf[off+2] = 0x0; | 285 | buf[off+2] = 0x0; |
290 | memcpy((unsigned char *)&buf[off+4], "LIO-ORG", 8); | 286 | memcpy(&buf[off+4], "LIO-ORG", 8); |
291 | /* Extra Byte for NULL Terminator */ | 287 | /* Extra Byte for NULL Terminator */ |
292 | id_len++; | 288 | id_len++; |
293 | /* Identifier Length */ | 289 | /* Identifier Length */ |