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

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

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



The ->rport_flush_queue callback only ever had a single
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 e76ee65f

drivers/scsi/fcoe/fcoe_ctlr.c

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ static void fcoe_ctlr_disc_stop(struct fc_lport *lport) 
static void fcoe_ctlr_disc_stop_final(struct fc_lport *lport)

{

	fcoe_ctlr_disc_stop(lport);

	lport->tt.rport_flush_queue();

	fc_rport_flush_queue();

	synchronize_rcu();

}

drivers/scsi/libfc/fc_disc.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void fc_disc_stop(struct fc_lport *lport) 
static void fc_disc_stop_final(struct fc_lport *lport)

{

	fc_disc_stop(lport);

	lport->tt.rport_flush_queue();

	fc_rport_flush_queue();

}



/**

drivers/scsi/libfc/fc_lport.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ int fc_fabric_logoff(struct fc_lport *lport) 
	if (lport->dns_rdata)

		fc_rport_logoff(lport->dns_rdata);

	mutex_unlock(&lport->lp_mutex);

	lport->tt.rport_flush_queue();

	fc_rport_flush_queue();

	mutex_lock(&lport->lp_mutex);

	fc_lport_enter_logo(lport);

	mutex_unlock(&lport->lp_mutex);

drivers/scsi/libfc/fc_rport.c

+2 −4
Original line number Diff line number Diff line
@@ -2175,10 +2175,11 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp) 
/**

 * fc_rport_flush_queue() - Flush the rport_event_queue

 */

static void fc_rport_flush_queue(void)

void fc_rport_flush_queue(void)

{

	flush_workqueue(rport_event_queue);

}

EXPORT_SYMBOL(fc_rport_flush_queue);



/**

 * fc_rport_init() - Initialize the remote port layer for a local port
@@ -2186,9 +2187,6 @@ static void fc_rport_flush_queue(void) 
 */

int fc_rport_init(struct fc_lport *lport)

{

	if (!lport->tt.rport_flush_queue)

		lport->tt.rport_flush_queue = fc_rport_flush_queue;



	return 0;

}

EXPORT_SYMBOL(fc_rport_init);

include/scsi/libfc.h

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

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



	/*

	 * Flush the rport work queue. Generally used before shutdown.

	 *

	 * STATUS: OPTIONAL

	 */

	void (*rport_flush_queue)(void);



	/*

	 * Set the local port FC_ID.

	 *
@@ -994,6 +987,7 @@ void fc_rport_destroy(struct kref *kref); 
int fc_rport_login(struct fc_rport_priv *rdata);

int fc_rport_logoff(struct fc_rport_priv *rdata);

void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp);

void fc_rport_flush_queue(void);



/*

 * DISCOVERY LAYER