Commit 41a211d8 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: remove obsolete link state DELETING 



The connection layer in af_smc.c is now using the new LLC flow
framework, which made the link state DELETING obsolete. Remove the state
and the respective helpers.

Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42d18acc

net/smc/smc_core.c

+1 −3
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ static int smcr_link_send_delete(struct smc_link *lnk, bool orderly) 
{

	if (lnk->state == SMC_LNK_ACTIVE &&

	    !smc_llc_send_delete_link(lnk, SMC_LLC_REQ, orderly)) {

		smc_llc_link_deleting(lnk);

		return 0;

	}

	return -ENOTCONN;
@@ -767,8 +766,7 @@ void smc_port_terminate(struct smc_ib_device *smcibdev, u8 ibport) 
			continue;

		/* tbd - terminate only when no more links are active */

		for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++) {

			if (!smc_link_usable(&lgr->lnk[i]) ||

			    lgr->lnk[i].state == SMC_LNK_DELETING)

			if (!smc_link_usable(&lgr->lnk[i]))

				continue;

			if (lgr->lnk[i].smcibdev == smcibdev &&

			    lgr->lnk[i].ibport == ibport) {

net/smc/smc_core.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ enum smc_link_state { /* possible states of a link */ 
	SMC_LNK_INACTIVE,	/* link is inactive */

	SMC_LNK_ACTIVATING,	/* link is being activated */

	SMC_LNK_ACTIVE,		/* link is active */

	SMC_LNK_DELETING,	/* link is being deleted */

};



#define SMC_WR_BUF_SIZE		48	/* size of work request buffer */

net/smc/smc_llc.c

+0 −7
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ static void smc_llc_rx_delete_link(struct smc_link *link, 
	struct smc_link_group *lgr = smc_get_lgr(link);



	smc_lgr_forget(lgr);

	smc_llc_link_deleting(link);

	if (lgr->role == SMC_SERV) {

		/* client asks to delete this link, send request */

		smc_llc_prep_delete_link(llc, link, SMC_LLC_REQ, true);
@@ -878,12 +877,6 @@ void smc_llc_link_active(struct smc_link *link) 
	}

}



void smc_llc_link_deleting(struct smc_link *link)

{

	link->state = SMC_LNK_DELETING;

	smc_wr_wakeup_tx_wait(link);

}



/* called in worker context */

void smc_llc_link_clear(struct smc_link *link)

{

net/smc/smc_llc.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ void smc_llc_lgr_init(struct smc_link_group *lgr, struct smc_sock *smc); 
void smc_llc_lgr_clear(struct smc_link_group *lgr);

int smc_llc_link_init(struct smc_link *link);

void smc_llc_link_active(struct smc_link *link);

void smc_llc_link_deleting(struct smc_link *link);

void smc_llc_link_clear(struct smc_link *link);

int smc_llc_do_confirm_rkey(struct smc_link *send_link,

			    struct smc_buf_desc *rmb_desc);