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

Commit 5c6cd613 authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by James Bottomley
Browse files

[SCSI] target: Convert TMR REQ/RSP definitions to target namespace 



This patch changes include/target/target_core_tmr.h code to use
target specific 'TMR_*' prefixed definitions for fabric independent
SCSI Task Management Request/Request naming in include/scsi/scsi.h
definitions for mainline target code.

Signed-off-by: default avatarNicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 065f9716

drivers/target/target_core_transport.c

+7 −12
Original line number Diff line number Diff line
@@ -5832,31 +5832,26 @@ int transport_generic_do_tmr(struct se_cmd *cmd) 
	int ret;



	switch (tmr->function) {

	case ABORT_TASK:

	case TMR_ABORT_TASK:

		ref_cmd = tmr->ref_cmd;

		tmr->response = TMR_FUNCTION_REJECTED;

		break;

	case ABORT_TASK_SET:

	case CLEAR_ACA:

	case CLEAR_TASK_SET:

	case TMR_ABORT_TASK_SET:

	case TMR_CLEAR_ACA:

	case TMR_CLEAR_TASK_SET:

		tmr->response = TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;

		break;

	case LUN_RESET:

	case TMR_LUN_RESET:

		ret = core_tmr_lun_reset(dev, tmr, NULL, NULL);

		tmr->response = (!ret) ? TMR_FUNCTION_COMPLETE :

					 TMR_FUNCTION_REJECTED;

		break;

#if 0

	case TARGET_WARM_RESET:

		transport_generic_host_reset(dev->se_hba);

	case TMR_TARGET_WARM_RESET:

		tmr->response = TMR_FUNCTION_REJECTED;

		break;

	case TARGET_COLD_RESET:

		transport_generic_host_reset(dev->se_hba);

		transport_generic_cold_reset(dev->se_hba);

	case TMR_TARGET_COLD_RESET:

		tmr->response = TMR_FUNCTION_REJECTED;

		break;

#endif

	default:

		printk(KERN_ERR "Uknown TMR function: 0x%02x.\n",

				tmr->function);

include/target/target_core_tmr.h

+22 −30
Original line number Diff line number Diff line 
#ifndef TARGET_CORE_TMR_H

#define TARGET_CORE_TMR_H



/* task management function values */

#ifdef ABORT_TASK

#undef ABORT_TASK

#endif /* ABORT_TASK */

#define ABORT_TASK				1

#ifdef ABORT_TASK_SET

#undef ABORT_TASK_SET

#endif /* ABORT_TASK_SET */

#define ABORT_TASK_SET				2

#ifdef CLEAR_ACA

#undef CLEAR_ACA

#endif /* CLEAR_ACA */

#define CLEAR_ACA				3

#ifdef CLEAR_TASK_SET

#undef CLEAR_TASK_SET

#endif /* CLEAR_TASK_SET */

#define CLEAR_TASK_SET				4

#define LUN_RESET				5

#define TARGET_WARM_RESET			6

#define TARGET_COLD_RESET			7

#define TASK_REASSIGN				8

/* fabric independent task management function values */

enum tcm_tmreq_table {

	TMR_ABORT_TASK		= 1,

	TMR_ABORT_TASK_SET	= 2,

	TMR_CLEAR_ACA		= 3,

	TMR_CLEAR_TASK_SET	= 4,

	TMR_LUN_RESET		= 5,

	TMR_TARGET_WARM_RESET	= 6,

	TMR_TARGET_COLD_RESET	= 7,

	TMR_FABRIC_TMR		= 255,

};



/* task management response values */

#define TMR_FUNCTION_COMPLETE			0

#define TMR_TASK_DOES_NOT_EXIST			1

#define TMR_LUN_DOES_NOT_EXIST			2

#define TMR_TASK_STILL_ALLEGIANT		3

#define TMR_TASK_FAILOVER_NOT_SUPPORTED		4

#define TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	5

#define TMR_FUNCTION_AUTHORIZATION_FAILED	6

#define TMR_FUNCTION_REJECTED			255

/* fabric independent task management response values */

enum tcm_tmrsp_table {

	TMR_FUNCTION_COMPLETE		= 0,

	TMR_TASK_DOES_NOT_EXIST		= 1,

	TMR_LUN_DOES_NOT_EXIST		= 2,

	TMR_TASK_STILL_ALLEGIANT	= 3,

	TMR_TASK_FAILOVER_NOT_SUPPORTED	= 4,

	TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	= 5,

	TMR_FUNCTION_AUTHORIZATION_FAILED = 6,

	TMR_FUNCTION_REJECTED		= 255,

};



extern struct kmem_cache *se_tmr_req_cache;