From 2b0fb94aff1f8dce5d14c5698318afbd3df46c52 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 27 Jul 2011 01:32:38 +0000 Subject: [PATCH] Merged revisions 3720-3721 via svnmerge from https://vlnb@scst.svn.sourceforge.net/svnroot/scst/trunk ........ r3720 | bvassche | 2011-07-22 07:57:25 -0400 (Fri, 22 Jul 2011) | 1 line scst_vdisk: Fix spelling of a macro name ........ r3721 | bvassche | 2011-07-22 08:25:08 -0400 (Fri, 22 Jul 2011) | 1 line scst_vdisk: Join two source code lines ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3780 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index a683af980..f4315ac11 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -62,7 +62,7 @@ static struct scst_trace_log vdisk_local_trace_tbl[] = { }; #define trace_log_tbl vdisk_local_trace_tbl -#define VDISK_TRACE_TLB_HELP ", order" +#define VDISK_TRACE_TBL_HELP ", order" #endif @@ -404,7 +404,7 @@ static struct scst_dev_type vdisk_file_devtype = { .trace_flags = &trace_flag, .trace_tbl = vdisk_local_trace_tbl, #ifndef CONFIG_SCST_PROC - .trace_tbl_help = VDISK_TRACE_TLB_HELP, + .trace_tbl_help = VDISK_TRACE_TBL_HELP, #endif #endif }; @@ -439,7 +439,7 @@ static struct scst_dev_type vdisk_blk_devtype = { .trace_flags = &trace_flag, .trace_tbl = vdisk_local_trace_tbl, #ifndef CONFIG_SCST_PROC - .trace_tbl_help = VDISK_TRACE_TLB_HELP, + .trace_tbl_help = VDISK_TRACE_TBL_HELP, #endif #endif }; @@ -471,7 +471,7 @@ static struct scst_dev_type vdisk_null_devtype = { .trace_flags = &trace_flag, .trace_tbl = vdisk_local_trace_tbl, #ifndef CONFIG_SCST_PROC - .trace_tbl_help = VDISK_TRACE_TLB_HELP, + .trace_tbl_help = VDISK_TRACE_TBL_HELP, #endif #endif }; @@ -504,7 +504,7 @@ static struct scst_dev_type vcdrom_devtype = { .trace_flags = &trace_flag, .trace_tbl = vdisk_local_trace_tbl, #ifndef CONFIG_SCST_PROC - .trace_tbl_help = VDISK_TRACE_TLB_HELP, + .trace_tbl_help = VDISK_TRACE_TBL_HELP, #endif #endif }; @@ -4989,8 +4989,7 @@ static int vcdrom_open(char *p, char *name) cdrom_empty = 1; TRACE_DBG("%s", "No media"); } else if (*filename != '/') { - PRINT_ERROR("File path \"%s\" is not " - "absolute", filename); + PRINT_ERROR("File path \"%s\" is not absolute", filename); res = -EINVAL; goto out; } else