Commit 8cf3f3e4 authored by Karsten Graul's avatar Karsten Graul Committed by Jakub Kicinski
Browse files

net/smc: use helper smc_conn_abort() in listen processing 



The helper smc_connect_abort() can be used by the listen processing
functions, too. And rename this helper to smc_conn_abort() to make the
purpose clearer.
No functional change.

Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d31c0800

net/smc/af_smc.c

+5 −12
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code, 
	return smc_connect_fallback(smc, reason_code);

}



/* abort connecting */

static void smc_connect_abort(struct smc_sock *smc, int local_first)

static void smc_conn_abort(struct smc_sock *smc, int local_first)

{

	if (local_first)

		smc_lgr_cleanup_early(&smc->conn);
@@ -814,7 +813,7 @@ static int smc_connect_rdma(struct smc_sock *smc, 


	return 0;

connect_abort:

	smc_connect_abort(smc, ini->first_contact_local);

	smc_conn_abort(smc, ini->first_contact_local);

	mutex_unlock(&smc_client_lgr_pending);

	smc->connect_nonblock = 0;
@@ -893,7 +892,7 @@ static int smc_connect_ism(struct smc_sock *smc, 


	return 0;

connect_abort:

	smc_connect_abort(smc, ini->first_contact_local);

	smc_conn_abort(smc, ini->first_contact_local);

	mutex_unlock(&smc_server_lgr_pending);

	smc->connect_nonblock = 0;
@@ -1321,10 +1320,7 @@ static void smc_listen_decline(struct smc_sock *new_smc, int reason_code, 
			       int local_first, u8 version)

{

	/* RDMA setup failed, switch back to TCP */

	if (local_first)

		smc_lgr_cleanup_early(&new_smc->conn);

	else

		smc_conn_free(&new_smc->conn);

	smc_conn_abort(new_smc, local_first);

	if (reason_code < 0) { /* error, no fallback possible */

		smc_listen_out_err(new_smc);

		return;
@@ -1430,10 +1426,7 @@ static int smc_listen_ism_init(struct smc_sock *new_smc, 
	/* Create send and receive buffers */

	rc = smc_buf_create(new_smc, true);

	if (rc) {

		if (ini->first_contact_local)

			smc_lgr_cleanup_early(&new_smc->conn);

		else

			smc_conn_free(&new_smc->conn);

		smc_conn_abort(new_smc, ini->first_contact_local);

		return (rc == -ENOSPC) ? SMC_CLC_DECL_MAX_DMB :

					 SMC_CLC_DECL_MEM;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE