From f9ad2fcf8c66febf36cc13a92eaeba59e5f70454 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Sat, 15 Mar 2014 01:42:06 +0000 Subject: [PATCH] vdisk_blockio: Change default vendor name back to "SCST_BIO" In r5316 the default vendor name for vdisk_blockio devices was changed into "SCST_FIO". Change this back into "SCST_BIO". Signed-off-by: Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5332 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 210287d29..4232c6efd 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -4741,8 +4741,7 @@ static int vdev_create(struct scst_dev_type *devt, TRACE_DBG("t10_dev_id %s", virt_dev->t10_dev_id); sprintf(virt_dev->t10_vend_id, "%.*s", - (int)(sizeof(virt_dev->t10_vend_id) - 1), - virt_dev->blockio ? SCST_BIO_VENDOR : SCST_FIO_VENDOR); + (int)sizeof(virt_dev->t10_vend_id) - 1, SCST_FIO_VENDOR); sprintf(virt_dev->vend_specific_id, "%.*s", (int)(sizeof(virt_dev->vend_specific_id) - 1), @@ -5027,6 +5026,8 @@ static int vdev_blockio_add_device(const char *device_name, char *params) virt_dev->blockio = 1; virt_dev->wt_flag = DEF_WRITE_THROUGH; + sprintf(virt_dev->t10_vend_id, "%.*s", + (int)sizeof(virt_dev->t10_vend_id) - 1, SCST_BIO_VENDOR); res = vdev_parse_add_dev_params(virt_dev, params, allowed_params); if (res != 0) @@ -6637,6 +6638,9 @@ static int vdisk_write_proc(char *buffer, char **start, off_t offset, virt_dev->blockio = 1; /* Bad hack for anyway going out procfs */ virt_dev->vdev_devt = &vdisk_blk_devtype; + sprintf(virt_dev->t10_vend_id, "%.*s", + (int)sizeof(virt_dev->t10_vend_id) - 1, + SCST_BIO_VENDOR); TRACE_DBG("%s", "BLOCKIO"); } else if (!strncmp("REMOVABLE", p, 9)) { p += 9;