From efa4988d72c69d3024ee25ad1ae87c83b9f8267e Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Tue, 19 Jul 2011 08:09:01 +0000 Subject: [PATCH] target: Remove unnecessary *cdb transport_get_lun_for_cmd parameter This patch removes the now unnecessary 'unsigned char *cdb' function parameter from transport_get_lun_for_cmd(). This also includes updating lio-target, tcm_loop and tcm_fc usage of transport_get_lun_for_cmd(). Reported-by: Fubo Chen Signed-off-by: Nicholas A. Bellinger --- drivers/target/loopback/tcm_loop.c | 2 +- drivers/target/target_core_device.c | 1 - drivers/target/tcm_fc/tfc_cmd.c | 2 +- include/target/target_core_device.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c index 70c2e7fa6664..2d0f22a91f67 100644 --- a/drivers/target/loopback/tcm_loop.c +++ b/drivers/target/loopback/tcm_loop.c @@ -122,7 +122,7 @@ static struct se_cmd *tcm_loop_allocate_core_cmd( /* * Locate the struct se_lun pointer and attach it to struct se_cmd */ - if (transport_get_lun_for_cmd(se_cmd, NULL, tl_cmd->sc->device->lun) < 0) { + if (transport_get_lun_for_cmd(se_cmd, tl_cmd->sc->device->lun) < 0) { kmem_cache_free(tcm_loop_cmd_cache, tl_cmd); set_host_byte(sc, DID_NO_CONNECT); return NULL; diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index f5516a1a32e8..e76ffc5b2079 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -56,7 +56,6 @@ static void se_dev_stop(struct se_device *dev); int transport_get_lun_for_cmd( struct se_cmd *se_cmd, - unsigned char *cdb, u32 unpacked_lun) { struct se_dev_entry *deve; diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c index b2a106729d49..92a449aededa 100644 --- a/drivers/target/tcm_fc/tfc_cmd.c +++ b/drivers/target/tcm_fc/tfc_cmd.c @@ -637,7 +637,7 @@ static void ft_send_cmd(struct ft_cmd *cmd) fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd); cmd->lun = scsilun_to_int((struct scsi_lun *)fcp->fc_lun); - ret = transport_get_lun_for_cmd(&cmd->se_cmd, NULL, cmd->lun); + ret = transport_get_lun_for_cmd(&cmd->se_cmd, cmd->lun); if (ret < 0) { ft_dump_cmd(cmd, __func__); transport_send_check_condition_and_sense(&cmd->se_cmd, diff --git a/include/target/target_core_device.h b/include/target/target_core_device.h index 52b18a5752c9..d9745bfa4429 100644 --- a/include/target/target_core_device.h +++ b/include/target/target_core_device.h @@ -1,7 +1,7 @@ #ifndef TARGET_CORE_DEVICE_H #define TARGET_CORE_DEVICE_H -extern int transport_get_lun_for_cmd(struct se_cmd *, unsigned char *, u32); +extern int transport_get_lun_for_cmd(struct se_cmd *, u32); extern int transport_get_lun_for_tmr(struct se_cmd *, u32); extern struct se_dev_entry *core_get_se_deve_from_rtpi( struct se_node_acl *, u16); -- 2.11.0