openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: libfc: Replace ->seq_start_next callback with function call 

The ->seq_start_next callback only ever had one implementation,
so call the function directly and drop the callback.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2016-10-18 10:01:51 +02:00 committed by Martin K. Petersen
parent 768c72cc34
commit c6865b30be
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/libfc/fc_exch.c
View File

@ -585,7 +585,7 @@ static struct fc_seq *fc_seq_start_next_locked(struct fc_seq *sp)
* for a given sequence/exchange pair * for a given sequence/exchange pair
* @sp: The sequence/exchange to get a new exchange for * @sp: The sequence/exchange to get a new exchange for
*/ */
static struct fc_seq *fc_seq_start_next(struct fc_seq *sp) struct fc_seq *fc_seq_start_next(struct fc_seq *sp)
{ {
struct fc_exch *ep = fc_seq_exch(sp); struct fc_exch *ep = fc_seq_exch(sp);
@ -595,6 +595,7 @@ static struct fc_seq *fc_seq_start_next(struct fc_seq *sp)
return sp; return sp;
} }
EXPORT_SYMBOL(fc_seq_start_next);
/* /*
* Set the response handler for the exchange associated with a sequence. * Set the response handler for the exchange associated with a sequence.
@ -2649,9 +2650,6 @@ EXPORT_SYMBOL(fc_exch_recv);
*/ */
int fc_exch_init(struct fc_lport *lport) int fc_exch_init(struct fc_lport *lport)
{ {
if (!lport->tt.seq_start_next)
lport->tt.seq_start_next = fc_seq_start_next;
if (!lport->tt.seq_set_resp) if (!lport->tt.seq_set_resp)
lport->tt.seq_set_resp = fc_seq_set_resp; lport->tt.seq_set_resp = fc_seq_set_resp;

4
drivers/scsi/libfc/fc_fcp.c
View File

@ -653,7 +653,7 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq,
remaining = seq_blen; remaining = seq_blen;
fh_parm_offset = frame_offset = offset; fh_parm_offset = frame_offset = offset;
tlen = 0; tlen = 0;
seq = lport->tt.seq_start_next(seq); seq = fc_seq_start_next(seq);
f_ctl = FC_FC_REL_OFF; f_ctl = FC_FC_REL_OFF;
WARN_ON(!seq); WARN_ON(!seq);
@ -1024,7 +1024,7 @@ static void fc_fcp_complete_locked(struct fc_fcp_pkt *fsp)
struct fc_frame *conf_frame; struct fc_frame *conf_frame;
struct fc_seq *csp; struct fc_seq *csp;
csp = lport->tt.seq_start_next(seq); csp = fc_seq_start_next(seq);
conf_frame = fc_fcp_frame_alloc(fsp->lp, 0); conf_frame = fc_fcp_frame_alloc(fsp->lp, 0);
if (conf_frame) { if (conf_frame) {
f_ctl = FC_FC_SEQ_INIT; f_ctl = FC_FC_SEQ_INIT;

2
drivers/scsi/libfc/fc_libfc.c
View File

@ -226,7 +226,7 @@ void fc_fill_reply_hdr(struct fc_frame *fp, const struct fc_frame *in_fp,
sp = fr_seq(in_fp); sp = fr_seq(in_fp);
if (sp) if (sp)
fr_seq(fp) = fr_dev(in_fp)->tt.seq_start_next(sp); fr_seq(fp) = fc_seq_start_next(sp);
fc_fill_hdr(fp, in_fp, r_ctl, FC_FCTL_RESP, 0, parm_offset); fc_fill_hdr(fp, in_fp, r_ctl, FC_FCTL_RESP, 0, parm_offset);
} }
EXPORT_SYMBOL(fc_fill_reply_hdr); EXPORT_SYMBOL(fc_fill_reply_hdr);

4
drivers/target/tcm_fc/tfc_cmd.c
View File

@ -161,7 +161,7 @@ int ft_queue_status(struct se_cmd *se_cmd)
/* /*
* Send response. * Send response.
*/ */
cmd->seq = lport->tt.seq_start_next(cmd->seq); cmd->seq = fc_seq_start_next(cmd->seq);
fc_fill_fc_hdr(fp, FC_RCTL_DD_CMD_STATUS, ep->did, ep->sid, FC_TYPE_FCP, fc_fill_fc_hdr(fp, FC_RCTL_DD_CMD_STATUS, ep->did, ep->sid, FC_TYPE_FCP,
FC_FC_EX_CTX | FC_FC_LAST_SEQ | FC_FC_END_SEQ, 0); FC_FC_EX_CTX | FC_FC_LAST_SEQ | FC_FC_END_SEQ, 0);
@ -221,7 +221,7 @@ int ft_write_pending(struct se_cmd *se_cmd)
memset(txrdy, 0, sizeof(*txrdy)); memset(txrdy, 0, sizeof(*txrdy));
txrdy->ft_burst_len = htonl(se_cmd->data_length); txrdy->ft_burst_len = htonl(se_cmd->data_length);
cmd->seq = lport->tt.seq_start_next(cmd->seq); cmd->seq = fc_seq_start_next(cmd->seq);
fc_fill_fc_hdr(fp, FC_RCTL_DD_DATA_DESC, ep->did, ep->sid, FC_TYPE_FCP, fc_fill_fc_hdr(fp, FC_RCTL_DD_DATA_DESC, ep->did, ep->sid, FC_TYPE_FCP,
FC_FC_EX_CTX | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0); FC_FC_EX_CTX | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);

2
drivers/target/tcm_fc/tfc_io.c
View File

@ -82,7 +82,7 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
ep = fc_seq_exch(cmd->seq); ep = fc_seq_exch(cmd->seq);
lport = ep->lp; lport = ep->lp;
cmd->seq = lport->tt.seq_start_next(cmd->seq); cmd->seq = fc_seq_start_next(cmd->seq);
remaining = se_cmd->data_length; remaining = se_cmd->data_length;

8
include/scsi/libfc.h
View File

@ -514,13 +514,6 @@ struct libfc_function_template {
*/ */
void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb); void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);
/*
* Start a new sequence on the same exchange/sequence tuple.
*
* STATUS: OPTIONAL
*/
struct fc_seq *(*seq_start_next)(struct fc_seq *);
/* /*
* Set a response handler for the exchange of the sequence. * Set a response handler for the exchange of the sequence.
* *
@ -1019,6 +1012,7 @@ struct fc_seq *fc_exch_seq_send(struct fc_lport *lport,
void *arg, u32 timer_msec); void *arg, u32 timer_msec);
void fc_seq_els_rsp_send(struct fc_frame *, enum fc_els_cmd, void fc_seq_els_rsp_send(struct fc_frame *, enum fc_els_cmd,
struct fc_seq_els_data *); struct fc_seq_els_data *);
struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *, struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *,
struct fc_exch_mgr *, struct fc_exch_mgr *,
bool (*match)(struct fc_frame *)); bool (*match)(struct fc_frame *));