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

Commit 4f26998a authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target/iscsi: Remove unneeded wrapper functions 



iscsit_get_lun_for_{cmd,tmr} are unnecessary.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent ef286404

drivers/target/iscsi/iscsi_target.c

+4 −4
Original line number Diff line number Diff line
@@ -1006,8 +1006,8 @@ static int iscsit_handle_scsi_cmd( 
	/*

	 * The CDB is going to an se_device_t.

	 */

	ret = iscsit_get_lun_for_cmd(cmd, hdr->cdb,

				get_unaligned_le64(&hdr->lun));

	ret = transport_lookup_cmd_lun(&cmd->se_cmd,

				       scsilun_to_int(&hdr->lun));

	if (ret < 0) {

		if (cmd->se_cmd.scsi_sense_reason == TCM_NON_EXISTENT_LUN) {

			pr_debug("Responding to non-acl'ed,"
@@ -1746,8 +1746,8 @@ static int iscsit_handle_task_mgt_cmd( 
	 * Locate the struct se_lun for all TMRs not related to ERL=2 TASK_REASSIGN

	 */

	if (function != ISCSI_TM_FUNC_TASK_REASSIGN) {

		ret = iscsit_get_lun_for_tmr(cmd,

				get_unaligned_le64(&hdr->lun));

		ret = transport_lookup_tmr_lun(&cmd->se_cmd,

					       scsilun_to_int(&hdr->lun));

		if (ret < 0) {

			cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

			se_tmr->response = ISCSI_TMF_RSP_NO_LUN;

drivers/target/iscsi/iscsi_target_device.c

+0 −19
Original line number Diff line number Diff line
@@ -28,25 +28,6 @@ 
#include "iscsi_target_tpg.h"

#include "iscsi_target_util.h"



int iscsit_get_lun_for_tmr(

	struct iscsi_cmd *cmd,

	u64 lun)

{

	u32 unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);



	return transport_lookup_tmr_lun(&cmd->se_cmd, unpacked_lun);

}



int iscsit_get_lun_for_cmd(

	struct iscsi_cmd *cmd,

	unsigned char *cdb,

	u64 lun)

{

	u32 unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);



	return transport_lookup_cmd_lun(&cmd->se_cmd, unpacked_lun);

}



void iscsit_determine_maxcmdsn(struct iscsi_session *sess)

{

	struct se_node_acl *se_nacl;

drivers/target/iscsi/iscsi_target_device.h

+0 −2
Original line number Diff line number Diff line 
#ifndef ISCSI_TARGET_DEVICE_H

#define ISCSI_TARGET_DEVICE_H



extern int iscsit_get_lun_for_tmr(struct iscsi_cmd *, u64);

extern int iscsit_get_lun_for_cmd(struct iscsi_cmd *, unsigned char *, u64);

extern void iscsit_determine_maxcmdsn(struct iscsi_session *);

extern void iscsit_increment_maxcmdsn(struct iscsi_cmd *, struct iscsi_session *);