Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[~andy/linux] / drivers / target / target_core_pscsi.h

diff --git a/drivers/target/target_core_pscsi.h b/drivers/target/target_core_pscsi.h
index a4cd5d352c3aac585d6174fce04d246157407b75..ebf4f1ae2c83e78931bee09ae4c65ce64eb2e141 100644 (file)
--- a/drivers/target/target_core_pscsi.h
+++ b/drivers/target/target_core_pscsi.h
@@ -2,7 +2,6 @@
 #define TARGET_CORE_PSCSI_H
 
 #define PSCSI_VERSION          "v4.0"
-#define PSCSI_VIRTUAL_HBA_DEPTH        2048
 
 /* used in pscsi_find_alloc_len() */
 #ifndef INQUIRY_DATA_SIZE
@@ -24,13 +23,12 @@
 
 struct pscsi_plugin_task {
        struct se_task pscsi_task;
-       unsigned char *pscsi_cdb;
-       unsigned char __pscsi_cdb[TCM_MAX_COMMAND_SIZE];
        unsigned char pscsi_sense[SCSI_SENSE_BUFFERSIZE];
        int     pscsi_direction;
        int     pscsi_result;
        u32     pscsi_resid;
        struct request *pscsi_req;
+       unsigned char pscsi_cdb[0];
 } ____cacheline_aligned;
 
 #define PDF_HAS_CHANNEL_ID     0x01