scsi: libfc: Replace ->rport_logoff callback with function call (c96c792a) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/scsi/bnx2fc/bnx2fc_tgt.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,6 @@ static void bnx2fc_offload_session(struct fcoe_port *port,
	struct bnx2fc_rport *tgt,		struct bnx2fc_rport *tgt,
	struct fc_rport_priv *rdata)		struct fc_rport_priv *rdata)
	{		{
	struct fc_lport *lport = rdata->local_port;
	struct fc_rport *rport = rdata->rport;		struct fc_rport *rport = rdata->rport;
	struct bnx2fc_interface *interface = port->priv;		struct bnx2fc_interface *interface = port->priv;
	struct bnx2fc_hba *hba = interface->hba;		struct bnx2fc_hba *hba = interface->hba;
	@@ -160,7 +159,7 @@ static void bnx2fc_offload_session(struct fcoe_port *port,
	tgt_init_err:		tgt_init_err:
	if (tgt->fcoe_conn_id != -1)		if (tgt->fcoe_conn_id != -1)
	bnx2fc_free_conn_id(hba, tgt->fcoe_conn_id);		bnx2fc_free_conn_id(hba, tgt->fcoe_conn_id);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	}		}

	void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)		void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)

drivers/scsi/fcoe/fcoe_ctlr.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2153,7 +2153,7 @@ static void fcoe_ctlr_vn_rport_callback(struct fc_lport *lport,
	LIBFCOE_FIP_DBG(fip,		LIBFCOE_FIP_DBG(fip,
	"rport FLOGI limited port_id %6.6x\n",		"rport FLOGI limited port_id %6.6x\n",
	rdata->ids.port_id);		rdata->ids.port_id);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	}		}
	break;		break;
	default:		default:
	@@ -2179,7 +2179,7 @@ static void fcoe_ctlr_disc_stop_locked(struct fc_lport *lport)
	rcu_read_lock();		rcu_read_lock();
	list_for_each_entry_rcu(rdata, &lport->disc.rports, peers) {		list_for_each_entry_rcu(rdata, &lport->disc.rports, peers) {
	if (kref_get_unless_zero(&rdata->kref)) {		if (kref_get_unless_zero(&rdata->kref)) {
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	kref_put(&rdata->kref, fc_rport_destroy);		kref_put(&rdata->kref, fc_rport_destroy);
	}		}
	}		}
	@@ -2531,7 +2531,7 @@ static void fcoe_ctlr_vn_add(struct fcoe_ctlr fip, struct fc_rport_priv new)
	(ids->node_name != -1 && ids->node_name != new->ids.node_name)) {		(ids->node_name != -1 && ids->node_name != new->ids.node_name)) {
	mutex_unlock(&rdata->rp_mutex);		mutex_unlock(&rdata->rp_mutex);
	LIBFCOE_FIP_DBG(fip, "vn_add rport logoff %6.6x\n", port_id);		LIBFCOE_FIP_DBG(fip, "vn_add rport logoff %6.6x\n", port_id);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	mutex_lock(&rdata->rp_mutex);		mutex_lock(&rdata->rp_mutex);
	}		}
	ids->port_name = new->ids.port_name;		ids->port_name = new->ids.port_name;
	@@ -2729,7 +2729,7 @@ static unsigned long fcoe_ctlr_vn_age(struct fcoe_ctlr *fip)
	LIBFCOE_FIP_DBG(fip,		LIBFCOE_FIP_DBG(fip,
	"port %16.16llx fc_id %6.6x beacon expired\n",		"port %16.16llx fc_id %6.6x beacon expired\n",
	rdata->ids.port_name, rdata->ids.port_id);		rdata->ids.port_name, rdata->ids.port_id);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	} else if (time_before(deadline, next_time))		} else if (time_before(deadline, next_time))
	next_time = deadline;		next_time = deadline;
	kref_put(&rdata->kref, fc_rport_destroy);		kref_put(&rdata->kref, fc_rport_destroy);

drivers/scsi/libfc/fc_disc.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ static void fc_disc_stop_rports(struct fc_disc *disc)
	rcu_read_lock();		rcu_read_lock();
	list_for_each_entry_rcu(rdata, &disc->rports, peers) {		list_for_each_entry_rcu(rdata, &disc->rports, peers) {
	if (kref_get_unless_zero(&rdata->kref)) {		if (kref_get_unless_zero(&rdata->kref)) {
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	kref_put(&rdata->kref, fc_rport_destroy);		kref_put(&rdata->kref, fc_rport_destroy);
	}		}
	}		}
	@@ -301,7 +301,7 @@ static void fc_disc_done(struct fc_disc *disc, enum fc_disc_event event)
	if (rdata->disc_id == disc->disc_id)		if (rdata->disc_id == disc->disc_id)
	fc_rport_login(rdata);		fc_rport_login(rdata);
	else		else
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	}		}
	kref_put(&rdata->kref, fc_rport_destroy);		kref_put(&rdata->kref, fc_rport_destroy);
	}		}
	@@ -622,7 +622,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq sp, struct fc_frame fp,
	"Port-id %6.6x wwpn %16.16llx\n",		"Port-id %6.6x wwpn %16.16llx\n",
	rdata->ids.port_id, port_name);		rdata->ids.port_id, port_name);
	mutex_unlock(&rdata->rp_mutex);		mutex_unlock(&rdata->rp_mutex);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	mutex_lock(&lport->disc.disc_mutex);		mutex_lock(&lport->disc.disc_mutex);
	new_rdata = fc_rport_create(lport, rdata->ids.port_id);		new_rdata = fc_rport_create(lport, rdata->ids.port_id);
	mutex_unlock(&lport->disc.disc_mutex);		mutex_unlock(&lport->disc.disc_mutex);
	@@ -638,7 +638,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq sp, struct fc_frame fp,
	} else if (ntohs(cp->ct_cmd) == FC_FS_RJT) {		} else if (ntohs(cp->ct_cmd) == FC_FS_RJT) {
	FC_DISC_DBG(disc, "GPN_ID rejected reason %x exp %x\n",		FC_DISC_DBG(disc, "GPN_ID rejected reason %x exp %x\n",
	cp->ct_reason, cp->ct_explan);		cp->ct_reason, cp->ct_explan);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	} else {		} else {
	FC_DISC_DBG(disc, "GPN_ID unexpected response code %x\n",		FC_DISC_DBG(disc, "GPN_ID unexpected response code %x\n",
	ntohs(cp->ct_cmd));		ntohs(cp->ct_cmd));

drivers/scsi/libfc/fc_lport.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -200,7 +200,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport,
	"in the DNS or FDMI state, it's in the "		"in the DNS or FDMI state, it's in the "
	"%d state", rdata->ids.port_id,		"%d state", rdata->ids.port_id,
	lport->state);		lport->state);
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	}		}
	break;		break;
	case RPORT_EV_LOGO:		case RPORT_EV_LOGO:
	@@ -246,7 +246,7 @@ static void fc_lport_ptp_setup(struct fc_lport *lport,
	u64 remote_wwnn)		u64 remote_wwnn)
	{		{
	if (lport->ptp_rdata) {		if (lport->ptp_rdata) {
	lport->tt.rport_logoff(lport->ptp_rdata);		fc_rport_logoff(lport->ptp_rdata);
	kref_put(&lport->ptp_rdata->kref, fc_rport_destroy);		kref_put(&lport->ptp_rdata->kref, fc_rport_destroy);
	}		}
	mutex_lock(&lport->disc.disc_mutex);		mutex_lock(&lport->disc.disc_mutex);
	@@ -623,7 +623,7 @@ int fc_fabric_logoff(struct fc_lport *lport)
	lport->tt.disc_stop_final(lport);		lport->tt.disc_stop_final(lport);
	mutex_lock(&lport->lp_mutex);		mutex_lock(&lport->lp_mutex);
	if (lport->dns_rdata)		if (lport->dns_rdata)
	lport->tt.rport_logoff(lport->dns_rdata);		fc_rport_logoff(lport->dns_rdata);
	mutex_unlock(&lport->lp_mutex);		mutex_unlock(&lport->lp_mutex);
	lport->tt.rport_flush_queue();		lport->tt.rport_flush_queue();
	mutex_lock(&lport->lp_mutex);		mutex_lock(&lport->lp_mutex);
	@@ -1011,12 +1011,12 @@ EXPORT_SYMBOL(fc_lport_reset);
	static void fc_lport_reset_locked(struct fc_lport *lport)		static void fc_lport_reset_locked(struct fc_lport *lport)
	{		{
	if (lport->dns_rdata) {		if (lport->dns_rdata) {
	lport->tt.rport_logoff(lport->dns_rdata);		fc_rport_logoff(lport->dns_rdata);
	lport->dns_rdata = NULL;		lport->dns_rdata = NULL;
	}		}

	if (lport->ptp_rdata) {		if (lport->ptp_rdata) {
	lport->tt.rport_logoff(lport->ptp_rdata);		fc_rport_logoff(lport->ptp_rdata);
	kref_put(&lport->ptp_rdata->kref, fc_rport_destroy);		kref_put(&lport->ptp_rdata->kref, fc_rport_destroy);
	lport->ptp_rdata = NULL;		lport->ptp_rdata = NULL;
	}		}

drivers/scsi/libfc/fc_rport.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -295,7 +295,7 @@ static void fc_rport_work(struct work_struct *work)
	}		}
	if (!rport) {		if (!rport) {
	FC_RPORT_DBG(rdata, "Failed to add the rport\n");		FC_RPORT_DBG(rdata, "Failed to add the rport\n");
	lport->tt.rport_logoff(rdata);		fc_rport_logoff(rdata);
	kref_put(&rdata->kref, fc_rport_destroy);		kref_put(&rdata->kref, fc_rport_destroy);
	return;		return;
	}		}
	@@ -504,7 +504,7 @@ static void fc_rport_enter_delete(struct fc_rport_priv *rdata,
	* function will hold the rport lock, call an _enter_*		* function will hold the rport lock, call an _enter_*
	* function and then unlock the rport.		* function and then unlock the rport.
	*/		*/
	static int fc_rport_logoff(struct fc_rport_priv *rdata)		int fc_rport_logoff(struct fc_rport_priv *rdata)
	{		{
	struct fc_lport *lport = rdata->local_port;		struct fc_lport *lport = rdata->local_port;
	u32 port_id = rdata->ids.port_id;		u32 port_id = rdata->ids.port_id;
	@@ -538,6 +538,7 @@ static int fc_rport_logoff(struct fc_rport_priv *rdata)
	mutex_unlock(&rdata->rp_mutex);		mutex_unlock(&rdata->rp_mutex);
	return 0;		return 0;
	}		}
			EXPORT_SYMBOL(fc_rport_logoff);

	/**		/**
	* fc_rport_enter_ready() - Transition to the RPORT_ST_READY state		* fc_rport_enter_ready() - Transition to the RPORT_ST_READY state
	@@ -2184,9 +2185,6 @@ static void fc_rport_flush_queue(void)
	*/		*/
	int fc_rport_init(struct fc_lport *lport)		int fc_rport_init(struct fc_lport *lport)
	{		{
	if (!lport->tt.rport_logoff)
	lport->tt.rport_logoff = fc_rport_logoff;

	if (!lport->tt.rport_recv_req)		if (!lport->tt.rport_recv_req)
	lport->tt.rport_recv_req = fc_rport_recv_req;		lport->tt.rport_recv_req = fc_rport_recv_req;