Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d6d7201 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 1fd032ee

drivers/target/target_core_pscsi.c

+26 −0
Original line number Diff line number Diff line
@@ -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

drivers/target/target_core_transport.c

+0 −29
Original line number Diff line number Diff line
@@ -1315,34 +1315,6 @@ out: 
}

EXPORT_SYMBOL(transport_add_device_to_core_hba);



/*	transport_generic_prepare_cdb():

 *

 *	Since the Initiator sees iSCSI devices as LUNs,  the SCSI CDB will

 *	contain the iSCSI LUN in bits 7-5 of byte 1 as per SAM-2.

 *	The point of this is since we are mapping iSCSI LUNs to

 *	SCSI Target IDs having a non-zero LUN in the CDB will throw the

 *	devices and HBAs for a loop.

 */

static inline void transport_generic_prepare_cdb(

	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;

	}

}



int target_cmd_size_check(struct se_cmd *cmd, unsigned int size)

{

	struct se_device *dev = cmd->se_dev;
@@ -1471,7 +1443,6 @@ int target_setup_cmd_from_cdb( 
	unsigned long flags;

	int ret;



	transport_generic_prepare_cdb(cdb);

	/*

	 * Ensure that the received CDB is less than the max (252 + 8) bytes

	 * for VARIABLE_LENGTH_CMD