mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 3720-3721 via svnmerge from

Browse Source 
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
This commit is contained in:
Vladislav Bolkhovitin
2011-07-27 01:32:38 +00:00
parent 2ded8743df
commit 2b0fb94aff
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -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