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

Commit c6865b30 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

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: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 768c72cc

drivers/scsi/libfc/fc_exch.c

+2 −4
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static struct fc_seq *fc_seq_start_next_locked(struct fc_seq *sp) 
 *			 for a given sequence/exchange pair

 * @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);
@@ -595,6 +595,7 @@ static struct fc_seq *fc_seq_start_next(struct fc_seq *sp) 


	return sp;

}

EXPORT_SYMBOL(fc_seq_start_next);



/*

 * 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)

{

	if (!lport->tt.seq_start_next)

		lport->tt.seq_start_next = fc_seq_start_next;



	if (!lport->tt.seq_set_resp)

		lport->tt.seq_set_resp = fc_seq_set_resp;

drivers/scsi/libfc/fc_fcp.c

+2 −2
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq, 
	remaining = seq_blen;

	fh_parm_offset = frame_offset = offset;

	tlen = 0;

	seq = lport->tt.seq_start_next(seq);

	seq = fc_seq_start_next(seq);

	f_ctl = FC_FC_REL_OFF;

	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_seq *csp;



			csp = lport->tt.seq_start_next(seq);

			csp = fc_seq_start_next(seq);

			conf_frame = fc_fcp_frame_alloc(fsp->lp, 0);

			if (conf_frame) {

				f_ctl = FC_FC_SEQ_INIT;

drivers/scsi/libfc/fc_libfc.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void fc_fill_reply_hdr(struct fc_frame *fp, const struct fc_frame *in_fp, 


	sp = fr_seq(in_fp);

	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);

}

EXPORT_SYMBOL(fc_fill_reply_hdr);

drivers/target/tcm_fc/tfc_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ int ft_queue_status(struct se_cmd *se_cmd) 
	/*

	 * 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_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));

	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_FC_EX_CTX | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);

drivers/target/tcm_fc/tfc_io.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int ft_queue_data_in(struct se_cmd *se_cmd) 


	ep = fc_seq_exch(cmd->seq);

	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;