From 1c8f3f2b8ec746f12699578b8a00b36deb059016 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 7 Jul 2011 21:15:45 +0000 Subject: [PATCH] Merged revisions 3654 via svnmerge from https://vlnb@scst.svn.sourceforge.net/svnroot/scst/trunk ........ r3654 | bvassche | 2011-07-03 06:03:04 -0400 (Sun, 03 Jul 2011) | 1 line scst_vdisk: Always add a newline after [key] in sysfs attribute values ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3666 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 6024e2f13..a683af980 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -4169,7 +4169,7 @@ static ssize_t vdisk_sysfs_rd_only_show(struct kobject *kobj, pos = sprintf(buf, "%d\n%s", virt_dev->rd_only ? 1 : 0, (virt_dev->rd_only == DEF_RD_ONLY) ? "" : - SCST_SYSFS_KEY_MARK ""); + SCST_SYSFS_KEY_MARK "\n"); TRACE_EXIT_RES(pos); return pos; @@ -4189,7 +4189,7 @@ static ssize_t vdisk_sysfs_wt_show(struct kobject *kobj, pos = sprintf(buf, "%d\n%s", virt_dev->wt_flag ? 1 : 0, (virt_dev->wt_flag == DEF_WRITE_THROUGH) ? "" : - SCST_SYSFS_KEY_MARK ""); + SCST_SYSFS_KEY_MARK "\n"); TRACE_EXIT_RES(pos); return pos; @@ -4209,7 +4209,7 @@ static ssize_t vdisk_sysfs_tp_show(struct kobject *kobj, pos = sprintf(buf, "%d\n%s", virt_dev->thin_provisioned ? 1 : 0, (virt_dev->thin_provisioned == DEF_THIN_PROVISIONED) ? "" : - SCST_SYSFS_KEY_MARK ""); + SCST_SYSFS_KEY_MARK "\n"); TRACE_EXIT_RES(pos); return pos; @@ -4229,7 +4229,7 @@ static ssize_t vdisk_sysfs_nv_cache_show(struct kobject *kobj, pos = sprintf(buf, "%d\n%s", virt_dev->nv_cache ? 1 : 0, (virt_dev->nv_cache == DEF_NV_CACHE) ? "" : - SCST_SYSFS_KEY_MARK ""); + SCST_SYSFS_KEY_MARK "\n"); TRACE_EXIT_RES(pos); return pos; @@ -4249,7 +4249,7 @@ static ssize_t vdisk_sysfs_o_direct_show(struct kobject *kobj, pos = sprintf(buf, "%d\n%s", virt_dev->o_direct_flag ? 1 : 0, (virt_dev->o_direct_flag == DEF_O_DIRECT) ? "" : - SCST_SYSFS_KEY_MARK ""); + SCST_SYSFS_KEY_MARK "\n"); TRACE_EXIT_RES(pos); return pos;