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

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

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



The ->seq_exch_abort callback only ever had one implementation,
so we can as well call it 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 0cac937d

drivers/scsi/libfc/fc_exch.c

+8 −5
Original line number Diff line number Diff line
@@ -629,6 +629,13 @@ static void fc_seq_set_resp(struct fc_seq *sp, 
 * @ep:	The exchange to be aborted

 * @timer_msec: The period of time to wait before aborting

 *

 * Abort an exchange and sequence. Generally called because of a

 * exchange timeout or an abort from the upper layer.

 *

 * A timer_msec can be specified for abort timeout, if non-zero

 * timer_msec value is specified then exchange resp handler

 * will be called with timeout error if no response to abort.

 *

 * Locking notes:  Called with exch lock held

 *

 * Return value: 0 on success else error code
@@ -692,8 +699,7 @@ static int fc_exch_abort_locked(struct fc_exch *ep, 
 *

 * Return value: 0 on success else error code

 */

static int fc_seq_exch_abort(const struct fc_seq *req_sp,

			     unsigned int timer_msec)

int fc_seq_exch_abort(const struct fc_seq *req_sp, unsigned int timer_msec)

{

	struct fc_exch *ep;

	int error;
@@ -2654,9 +2660,6 @@ int fc_exch_init(struct fc_lport *lport) 
	if (!lport->tt.exch_mgr_reset)

		lport->tt.exch_mgr_reset = fc_exch_mgr_reset;



	if (!lport->tt.seq_exch_abort)

		lport->tt.seq_exch_abort = fc_seq_exch_abort;



	if (!lport->tt.seq_assign)

		lport->tt.seq_assign = fc_seq_assign;

drivers/scsi/libfc/fc_fcp.c

+2 −2
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ static int fc_fcp_send_abort(struct fc_fcp_pkt *fsp) 
	put_cpu();



	fsp->state |= FC_SRB_ABORT_PENDING;

	rc = fsp->lp->tt.seq_exch_abort(fsp->seq_ptr, 0);

	rc = fc_seq_exch_abort(fsp->seq_ptr, 0);

	/*

	 * ->seq_exch_abort() might return -ENXIO if

	 * fc_seq_exch_abort() might return -ENXIO if

	 * the sequence is already completed

	 */

	if (rc == -ENXIO) {

include/scsi/libfc.h

+1 −13
Original line number Diff line number Diff line
@@ -514,19 +514,6 @@ struct libfc_function_template { 
	 */

	void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);



	/*

	 * Abort an exchange and sequence. Generally called because of a

	 * exchange timeout or an abort from the upper layer.

	 *

	 * A timer_msec can be specified for abort timeout, if non-zero

	 * timer_msec value is specified then exchange resp handler

	 * will be called with timeout error if no response to abort.

	 *

	 * STATUS: OPTIONAL

	 */

	int (*seq_exch_abort)(const struct fc_seq *,

			      unsigned int timer_msec);



	/*

	 * Indicate that an exchange/sequence tuple is complete and the memory

	 * allocated for the related objects may be freed.
@@ -1052,6 +1039,7 @@ void fc_exch_mgr_free(struct fc_lport *); 
void fc_exch_recv(struct fc_lport *, struct fc_frame *);

void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);

int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp, struct fc_frame *fp);

int fc_seq_exch_abort(const struct fc_seq *, unsigned int timer_msec);



/*

 * Functions for fc_functions_template