diff options
author | Christoph Hellwig <hch@infradead.org> | 2012-05-20 11:59:17 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-07-16 17:28:40 -0700 |
commit | 3d6d72014f16967ca92765040be30f022c5952e6 (patch) | |
tree | ca4a3028d770ceab2b42fedca07e78d6d90a06b2 /drivers/target/target_core_pscsi.c | |
parent | 1fd032ee10d2816c947f5d5b9abda95e728f0a8f (diff) | |
download | op-kernel-dev-3d6d72014f16967ca92765040be30f022c5952e6.zip op-kernel-dev-3d6d72014f16967ca92765040be30f022c5952e6.tar.gz |
target: move transport_generic_prepare_cdb into pscsi
The virtual drivers don't need to clear cdb fields they never look at, so move
this code into the pscsi backend.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/target_core_pscsi.c')
-rw-r--r-- | drivers/target/target_core_pscsi.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 099c59d..9a776cc 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1022,6 +1022,30 @@ fail: return -ENOMEM; } +/* + * Clear a lun set in the cdb if the initiator talking to use spoke + * and old standards version, as we can't assume the underlying device + * won't choke up on it. + */ +static inline void pscsi_clear_cdb_lun(unsigned char *cdb) +{ + switch (cdb[0]) { + case READ_10: /* SBC - RDProtect */ + case READ_12: /* SBC - RDProtect */ + case READ_16: /* SBC - RDProtect */ + case SEND_DIAGNOSTIC: /* SPC - SELF-TEST Code */ + case VERIFY: /* SBC - VRProtect */ + case VERIFY_16: /* SBC - VRProtect */ + case WRITE_VERIFY: /* SBC - VRProtect */ + case WRITE_VERIFY_12: /* SBC - VRProtect */ + case MAINTENANCE_IN: /* SPC - Parameter Data Format for SA RTPG */ + break; + default: + cdb[1] &= 0x1f; /* clear logical unit number */ + break; + } +} + static int pscsi_parse_cdb(struct se_cmd *cmd) { unsigned char *cdb = cmd->t_task_cdb; @@ -1034,6 +1058,8 @@ static int pscsi_parse_cdb(struct se_cmd *cmd) return -EINVAL; } + pscsi_clear_cdb_lun(cdb); + /* * For REPORT LUNS we always need to emulate the respone, and for everything * related to persistent reservations and ALUA we might optionally use our |