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

Commit 7cccc157 authored by Chris Leech's avatar Chris Leech Committed by James Bottomley
Browse files

[SCSI] libfc: combine name server registration response handlers 



They all do the same thing, so combine them into a single function.

Signed-off-by: default avatarChris Leech <christopher.leech@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c9866a54

drivers/scsi/libfc/fc_lport.c

+30 −175
Original line number Diff line number Diff line
@@ -985,9 +985,9 @@ static void fc_lport_error(struct fc_lport *lport, struct fc_frame *fp) 
}



/**

 * fc_lport_rft_id_resp() - Handle response to Register Fibre

 *			    Channel Types by ID (RFT_ID) request

 * @sp: current sequence in RFT_ID exchange

 * fc_lport_ns_resp() - Handle response to a name server

 * 			registration exchange

 * @sp: current sequence in exchange

 * @fp: response frame

 * @lp_arg: Fibre Channel host port instance

 *
@@ -995,23 +995,23 @@ static void fc_lport_error(struct fc_lport *lport, struct fc_frame *fp) 
 * held, but it will lock, call an _enter_* function or fc_lport_error

 * and then unlock the lport.

 */

static void fc_lport_rft_id_resp(struct fc_seq *sp, struct fc_frame *fp,

static void fc_lport_ns_resp(struct fc_seq *sp, struct fc_frame *fp,

			     void *lp_arg)

{

	struct fc_lport *lport = lp_arg;

	struct fc_frame_header *fh;

	struct fc_ct_hdr *ct;



	FC_LPORT_DBG(lport, "Received a RFT_ID %s\n", fc_els_resp_type(fp));

	FC_LPORT_DBG(lport, "Received a ns %s\n", fc_els_resp_type(fp));



	if (fp == ERR_PTR(-FC_EX_CLOSED))

		return;



	mutex_lock(&lport->lp_mutex);



	if (lport->state != LPORT_ST_RFT_ID) {

		FC_LPORT_DBG(lport, "Received a RFT_ID response, but in state "

			     "%s\n", fc_lport_state(lport));

	if (lport->state < LPORT_ST_RNN_ID || lport->state > LPORT_ST_RFT_ID) {

		FC_LPORT_DBG(lport, "Received a name server response, "

				    "but in state %s\n", fc_lport_state(lport));

		if (IS_ERR(fp))

			goto err;

		goto out;
@@ -1029,170 +1029,25 @@ static void fc_lport_rft_id_resp(struct fc_seq *sp, struct fc_frame *fp, 
	    ct->ct_fs_type == FC_FST_DIR &&

	    ct->ct_fs_subtype == FC_NS_SUBTYPE &&

	    ntohs(ct->ct_cmd) == FC_FS_ACC)

		fc_lport_enter_scr(lport);

	else

		fc_lport_error(lport, fp);

out:

	fc_frame_free(fp);

err:

	mutex_unlock(&lport->lp_mutex);

}



/**

 * fc_lport_rspn_id_resp() - Handle response to Register Symbolic Port Name

 *			     by ID (RSPN_ID) request

 * @sp: current sequence in RSPN_ID exchange

 * @fp: response frame

 * @lp_arg: Fibre Channel host port instance

 *

 * Locking Note: This function will be called without the lport lock

 * held, but it will lock, call an _enter_* function or fc_lport_error

 * and then unlock the lport.

 */

static void fc_lport_rspn_id_resp(struct fc_seq *sp, struct fc_frame *fp,

				  void *lp_arg)

{

	struct fc_lport *lport = lp_arg;

	struct fc_frame_header *fh;

	struct fc_ct_hdr *ct;



	FC_LPORT_DBG(lport, "Received a RSPN_ID %s\n", fc_els_resp_type(fp));



	if (fp == ERR_PTR(-FC_EX_CLOSED))

		return;



	mutex_lock(&lport->lp_mutex);



	if (lport->state != LPORT_ST_RSPN_ID) {

		FC_LPORT_DBG(lport, "Received a RSPN_ID response, but in state "

			     "%s\n", fc_lport_state(lport));

		if (IS_ERR(fp))

			goto err;

		goto out;

	}



	if (IS_ERR(fp)) {

		fc_lport_error(lport, fp);

		goto err;

	}



	fh = fc_frame_header_get(fp);

	ct = fc_frame_payload_get(fp, sizeof(*ct));

	if (fh && ct && fh->fh_type == FC_TYPE_CT &&

	    ct->ct_fs_type == FC_FST_DIR &&

	    ct->ct_fs_subtype == FC_NS_SUBTYPE &&

	    ntohs(ct->ct_cmd) == FC_FS_ACC)

		fc_lport_enter_rspn_id(lport);

	else

		fc_lport_error(lport, fp);



out:

	fc_frame_free(fp);

err:

	mutex_unlock(&lport->lp_mutex);

}

/**

 * fc_lport_rsnn_nn_resp() - Handle response to Register Symbolic Node Name

 *			     by Node Name (RSNN_NN) request

 * @sp: current sequence in RSNN_NN exchange

 * @fp: response frame

 * @lp_arg: Fibre Channel host port instance

 *

 * Locking Note: This function will be called without the lport lock

 * held, but it will lock, call an _enter_* function or fc_lport_error

 * and then unlock the lport.

 */

static void fc_lport_rsnn_nn_resp(struct fc_seq *sp, struct fc_frame *fp,

				  void *lp_arg)

{

	struct fc_lport *lport = lp_arg;

	struct fc_frame_header *fh;

	struct fc_ct_hdr *ct;



	FC_LPORT_DBG(lport, "Received a RSNN_NN %s\n", fc_els_resp_type(fp));



	if (fp == ERR_PTR(-FC_EX_CLOSED))

		return;



	mutex_lock(&lport->lp_mutex);



	if (lport->state != LPORT_ST_RSNN_NN) {

		FC_LPORT_DBG(lport, "Received a RSNN_NN response, but in state "

			     "%s\n", fc_lport_state(lport));

		if (IS_ERR(fp))

			goto err;

		goto out;

	}



	if (IS_ERR(fp)) {

		fc_lport_error(lport, fp);

		goto err;

	}



	fh = fc_frame_header_get(fp);

	ct = fc_frame_payload_get(fp, sizeof(*ct));

	if (fh && ct && fh->fh_type == FC_TYPE_CT &&

	    ct->ct_fs_type == FC_FST_DIR &&

	    ct->ct_fs_subtype == FC_NS_SUBTYPE &&

	    ntohs(ct->ct_cmd) == FC_FS_ACC)

		switch (lport->state) {

		case LPORT_ST_RNN_ID:

			fc_lport_enter_rsnn_nn(lport);

	else

		fc_lport_error(lport, fp);



out:

	fc_frame_free(fp);

err:

	mutex_unlock(&lport->lp_mutex);

}



/**

 * fc_lport_rnn_id_resp() - Handle response to Register Node

 *			    Name by ID (RNN_ID) request

 * @sp: current sequence in RNN_ID exchange

 * @fp: response frame

 * @lp_arg: Fibre Channel host port instance

 *

 * Locking Note: This function will be called without the lport lock

 * held, but it will lock, call an _enter_* function or fc_lport_error

 * and then unlock the lport.

 */

static void fc_lport_rnn_id_resp(struct fc_seq *sp, struct fc_frame *fp,

				 void *lp_arg)

{

	struct fc_lport *lport = lp_arg;

	struct fc_frame_header *fh;

	struct fc_ct_hdr *ct;



	FC_LPORT_DBG(lport, "Received a RNN_ID %s\n", fc_els_resp_type(fp));



	if (fp == ERR_PTR(-FC_EX_CLOSED))

		return;



	mutex_lock(&lport->lp_mutex);



	if (lport->state != LPORT_ST_RNN_ID) {

		FC_LPORT_DBG(lport, "Received a RNN_ID response, but in state "

			     "%s\n", fc_lport_state(lport));

		if (IS_ERR(fp))

			goto err;

		goto out;

	}



	if (IS_ERR(fp)) {

		fc_lport_error(lport, fp);

		goto err;

	}



	fh = fc_frame_header_get(fp);

	ct = fc_frame_payload_get(fp, sizeof(*ct));

	if (fh && ct && fh->fh_type == FC_TYPE_CT &&

	    ct->ct_fs_type == FC_FST_DIR &&

	    ct->ct_fs_subtype == FC_NS_SUBTYPE &&

	    ntohs(ct->ct_cmd) == FC_FS_ACC)

			break;

		case LPORT_ST_RSNN_NN:

			fc_lport_enter_rspn_id(lport);

			break;

		case LPORT_ST_RSPN_ID:

			fc_lport_enter_rft_id(lport);

			break;

		case LPORT_ST_RFT_ID:

			fc_lport_enter_scr(lport);

			break;

		default:

			/* should have already been caught by state checks */

			break;

		}

	else

		fc_lport_error(lport, fp);



out:

	fc_frame_free(fp);

err:
@@ -1311,7 +1166,7 @@ static void fc_lport_enter_rft_id(struct fc_lport *lport) 
	}



	if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RFT_ID,

				  fc_lport_rft_id_resp,

				  fc_lport_ns_resp,

				  lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}
@@ -1342,7 +1197,7 @@ static void fc_lport_enter_rspn_id(struct fc_lport *lport) 
	}



	if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RSPN_ID,

				  fc_lport_rspn_id_resp,

				  fc_lport_ns_resp,

				  lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}
@@ -1373,7 +1228,7 @@ static void fc_lport_enter_rsnn_nn(struct fc_lport *lport) 
	}



	if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RSNN_NN,

				  fc_lport_rsnn_nn_resp,

				  fc_lport_ns_resp,

				  lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}
@@ -1402,7 +1257,7 @@ static void fc_lport_enter_rnn_id(struct fc_lport *lport) 
	}



	if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RNN_ID,

				  fc_lport_rnn_id_resp,

				  fc_lport_ns_resp,

				  lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}