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

net/smc: remove unused parameter of smc_lgr_terminate() 



The soft parameter of smc_lgr_terminate() is not used and obsolete.
Remove it.

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

net/smc/smc_clc.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, 
		smc->peer_diagnosis = ntohl(dclc->peer_diagnosis);

		if (((struct smc_clc_msg_decline *)buf)->hdr.flag) {

			smc->conn.lgr->sync_err = 1;

			smc_lgr_terminate(smc->conn.lgr, true);

			smc_lgr_terminate(smc->conn.lgr);

		}

	}

net/smc/smc_core.c

+8 −10
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void smc_lgr_terminate_work(struct work_struct *work) 
	struct smc_link_group *lgr = container_of(work, struct smc_link_group,

						  terminate_work);



	smc_lgr_terminate(lgr, true);

	smc_lgr_terminate(lgr);

}



/* create a new SMC link group */
@@ -581,7 +581,10 @@ static void smc_lgr_cleanup(struct smc_link_group *lgr) 
	}

}



/* terminate link group */

/* terminate link group

 * @soft: true if link group shutdown can take its time

 *	  false if immediate link group shutdown is required

 */

static void __smc_lgr_terminate(struct smc_link_group *lgr, bool soft)

{

	struct smc_connection *conn;
@@ -619,11 +622,8 @@ static void __smc_lgr_terminate(struct smc_link_group *lgr, bool soft) 
		smc_lgr_free(lgr);

}



/* unlink and terminate link group

 * @soft: true if link group shutdown can take its time

 *	  false if immediate link group shutdown is required

 */

void smc_lgr_terminate(struct smc_link_group *lgr, bool soft)

/* unlink and terminate link group */

void smc_lgr_terminate(struct smc_link_group *lgr)

{

	spinlock_t *lgr_lock;
@@ -633,11 +633,9 @@ void smc_lgr_terminate(struct smc_link_group *lgr, bool soft) 
		spin_unlock_bh(lgr_lock);

		return;	/* lgr already terminating */

	}

	if (!soft)

		lgr->freeing = 1;

	list_del_init(&lgr->list);

	spin_unlock_bh(lgr_lock);

	__smc_lgr_terminate(lgr, soft);

	__smc_lgr_terminate(lgr, true);

}



/* Called when IB port is terminated */

net/smc/smc_core.h

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ struct smc_clc_msg_accept_confirm; 
struct smc_clc_msg_local;



void smc_lgr_forget(struct smc_link_group *lgr);

void smc_lgr_terminate(struct smc_link_group *lgr, bool soft);

void smc_lgr_terminate(struct smc_link_group *lgr);

void smc_port_terminate(struct smc_ib_device *smcibdev, u8 ibport);

void smc_smcd_terminate(struct smcd_dev *dev, u64 peer_gid,

			unsigned short vlan);

net/smc/smc_llc.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static void smc_llc_testlink_work(struct work_struct *work) 
	rc = wait_for_completion_interruptible_timeout(&link->llc_testlink_resp,

						       SMC_LLC_WAIT_TIME);

	if (rc <= 0) {

		smc_lgr_terminate(smc_get_lgr(link), true);

		smc_lgr_terminate(smc_get_lgr(link));

		return;

	}

	next_interval = link->llc_testlink_time;