mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Rework r4372 such that fileio_tgt builds again

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4376 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-06-26 06:15:03 +00:00
parent d52dc638a3
commit a5a5e4a1e3
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scst/include/scst_const.h
View File

@@ -301,13 +301,14 @@ enum scst_cdb_flags {
#ifndef VERIFY_12
#define VERIFY_12 0xAF
#endif
#if !defined(GENERATING_UPSTREAM_PATCH) || \
LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
/*
* The constants below have been defined in the kernel header <scsi/scsi.h>
* and hence are not needed when this header file is included in kernel code.
* The definitions below are only used when this header file is included during
* compilation of SCST's user space components.
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
#ifndef READ_16
#define READ_16 0x88
#endif
@@ -317,13 +318,11 @@ enum scst_cdb_flags {
#ifndef VERIFY_16
#define VERIFY_16 0x8f
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
#ifndef MI_REPORT_IDENTIFYING_INFORMATION
#define MI_REPORT_IDENTIFYING_INFORMATION 0x05
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
#ifndef SERVICE_ACTION_IN
#define SERVICE_ACTION_IN 0x9e
#endif
@@ -337,17 +336,15 @@ enum scst_cdb_flags {
#define SAI_GET_LBA_STATUS 0x12
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
#ifndef GENERATING_UPSTREAM_PATCH
#ifndef REPORT_LUNS
#define REPORT_LUNS 0xa0
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
#ifndef WRITE_SAME_16
#define WRITE_SAME_16 0x93
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
/*