diff options
author | Andy Grover <agrover@redhat.com> | 2012-01-19 16:39:16 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-02-25 17:37:47 -0500 |
commit | 35b2cdc4fea1f0d13e1602c07e62c797c9fe5ed4 (patch) | |
tree | 7cf4bbb95bd7b591c9c8ca6503e812dafdfc4471 /drivers | |
parent | 0dccb69d42a06d438c979c933a1657cb0b4ec4fb (diff) |
tcm_fc: Remove cmd->cdb data member
It's used only for debug output. Debug output may want to make use of
fcp->fc_cdb directly.
Signed-off-by: Andy Grover <agrover@redhat.com>
Cc: Kiran Patil <kiran.patil@intel.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/target/tcm_fc/tcm_fc.h | 1 | ||||
-rw-r--r-- | drivers/target/tcm_fc/tfc_cmd.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h index 559f3bd6868d..7906b9f8eba7 100644 --- a/drivers/target/tcm_fc/tcm_fc.h +++ b/drivers/target/tcm_fc/tcm_fc.h | |||
@@ -117,7 +117,6 @@ struct ft_cmd { | |||
117 | struct fc_seq *seq; /* sequence in exchange mgr */ | 117 | struct fc_seq *seq; /* sequence in exchange mgr */ |
118 | struct se_cmd se_cmd; /* Local TCM I/O descriptor */ | 118 | struct se_cmd se_cmd; /* Local TCM I/O descriptor */ |
119 | struct fc_frame *req_frame; | 119 | struct fc_frame *req_frame; |
120 | unsigned char *cdb; /* pointer to CDB inside frame */ | ||
121 | u32 write_data_len; /* data received on writes */ | 120 | u32 write_data_len; /* data received on writes */ |
122 | struct work_struct work; | 121 | struct work_struct work; |
123 | /* Local sense buffer */ | 122 | /* Local sense buffer */ |
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c index 6b8d854cc71a..a76661178d6b 100644 --- a/drivers/target/tcm_fc/tfc_cmd.c +++ b/drivers/target/tcm_fc/tfc_cmd.c | |||
@@ -59,8 +59,6 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller) | |||
59 | se_cmd = &cmd->se_cmd; | 59 | se_cmd = &cmd->se_cmd; |
60 | pr_debug("%s: cmd %p sess %p seq %p se_cmd %p\n", | 60 | pr_debug("%s: cmd %p sess %p seq %p se_cmd %p\n", |
61 | caller, cmd, cmd->sess, cmd->seq, se_cmd); | 61 | caller, cmd, cmd->sess, cmd->seq, se_cmd); |
62 | pr_debug("%s: cmd %p cdb %p\n", | ||
63 | caller, cmd, cmd->cdb); | ||
64 | 62 | ||
65 | pr_debug("%s: cmd %p data_nents %u len %u se_cmd_flags <0x%x>\n", | 63 | pr_debug("%s: cmd %p data_nents %u len %u se_cmd_flags <0x%x>\n", |
66 | caller, cmd, se_cmd->t_data_nents, | 64 | caller, cmd, se_cmd->t_data_nents, |
@@ -80,8 +78,6 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller) | |||
80 | caller, cmd, ep->sid, ep->did, ep->oxid, ep->rxid, | 78 | caller, cmd, ep->sid, ep->did, ep->oxid, ep->rxid, |
81 | sp->id, ep->esb_stat); | 79 | sp->id, ep->esb_stat); |
82 | } | 80 | } |
83 | print_hex_dump(KERN_INFO, "ft_dump_cmd ", DUMP_PREFIX_NONE, | ||
84 | 16, 4, cmd->cdb, MAX_COMMAND_SIZE, 0); | ||
85 | } | 81 | } |
86 | 82 | ||
87 | static void ft_free_cmd(struct ft_cmd *cmd) | 83 | static void ft_free_cmd(struct ft_cmd *cmd) |
@@ -584,14 +580,12 @@ static void ft_send_work(struct work_struct *work) | |||
584 | task_attr = MSG_SIMPLE_TAG; | 580 | task_attr = MSG_SIMPLE_TAG; |
585 | } | 581 | } |
586 | 582 | ||
587 | cmd->cdb = fcp->fc_cdb; | ||
588 | |||
589 | fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd); | 583 | fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd); |
590 | /* | 584 | /* |
591 | * Use a single se_cmd->cmd_kref as we expect to release se_cmd | 585 | * Use a single se_cmd->cmd_kref as we expect to release se_cmd |
592 | * directly from ft_check_stop_free callback in response path. | 586 | * directly from ft_check_stop_free callback in response path. |
593 | */ | 587 | */ |
594 | target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb, | 588 | target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, fcp->fc_cdb, |
595 | &cmd->ft_sense_buffer[0], scsilun_to_int(&fcp->fc_lun), | 589 | &cmd->ft_sense_buffer[0], scsilun_to_int(&fcp->fc_lun), |
596 | ntohl(fcp->fc_dl), task_attr, data_dir, 0); | 590 | ntohl(fcp->fc_dl), task_attr, data_dir, 0); |
597 | pr_debug("r_ctl %x alloc target_submit_cmd\n", fh->fh_r_ctl); | 591 | pr_debug("r_ctl %x alloc target_submit_cmd\n", fh->fh_r_ctl); |