Signed-off-by: David Disseldorp
---
drivers/target/target_core_stat.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/target/target_core_stat.c
b/drivers/target/target_core_stat.c
index f0db91ebd735..89f35167f036 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -804,10 +804,17 @@ static ssize_t target_stat_transport_dev_name_show(struct
config_item *item,
if (dev) {
wwn = >t10_wwn;
/* scsiTransportDevName */
- ret = snprintf(page, PAGE_SIZE, "%s+%s\n",
+ if (strlen(wwn->unit_serial)) {
+ ret = snprintf(page, PAGE_SIZE, "%s+%s\n",
+ tpg->se_tpg_tfo->tpg_get_wwn(tpg),
+ wwn->unit_serial);
+ } else {
+ ret = snprintf(page, PAGE_SIZE, "%s+%."
+ __stringify(INQUIRY_VENDOR_IDENTIFIER_LEN)
+ "s\n",
tpg->se_tpg_tfo->tpg_get_wwn(tpg),
- (strlen(wwn->unit_serial)) ? wwn->unit_serial :
wwn->vendor);
+ }
}
rcu_read_unlock();
return ret;
--
2.13.7