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

Commit a1c1e4e7 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

[SCSI] libfc: rearrange code in fc_disc_gpn_ft_resp() 



Code cleanup for fc_disc_gpn_ft_resp().

Some of the fc_disc.c code was poorly formatted. For example, some lines
in fc_disc.c were unnecessarily truncated and the buf variable could
be eliminated.

Also moved the increment of seq_count into fc_disc_gpn_ft_parse(), to
avoid doing it separately before each call.

Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c356afd4

drivers/scsi/libfc/fc_disc.c

+12 −16
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len) 
	struct fc_rport_priv *rdata;



	lport = disc->lport;

	disc->seq_count++;



	/*

	 * Handle partial name record left over from previous call.
@@ -582,10 +583,10 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, 
	struct fc_disc *disc = disc_arg;

	struct fc_ct_hdr *cp;

	struct fc_frame_header *fh;

	enum fc_disc_event event = DISC_EV_NONE;

	unsigned int seq_cnt;

	void *buf = NULL;

	unsigned int len;

	int error;

	int error = 0;



	mutex_lock(&disc->disc_mutex);

	FC_DISC_DBG(disc, "Received a GPN_FT response\n");
@@ -600,8 +601,7 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, 
	fh = fc_frame_header_get(fp);

	len = fr_len(fp) - sizeof(*fh);

	seq_cnt = ntohs(fh->fh_seq_cnt);

	if (fr_sof(fp) == FC_SOF_I3 && seq_cnt == 0 &&

	    disc->seq_count == 0) {

	if (fr_sof(fp) == FC_SOF_I3 && seq_cnt == 0 && disc->seq_count == 0) {

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

		if (!cp) {

			FC_DISC_DBG(disc, "GPN_FT response too short, len %d\n",
@@ -609,33 +609,29 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, 
		} else if (ntohs(cp->ct_cmd) == FC_FS_ACC) {



			/* Accepted, parse the response. */

			buf = cp + 1;

			len -= sizeof(*cp);

			error = fc_disc_gpn_ft_parse(disc, cp + 1, len);

		} else if (ntohs(cp->ct_cmd) == FC_FS_RJT) {

			FC_DISC_DBG(disc, "GPN_FT rejected reason %x exp %x "

				    "(check zoning)\n", cp->ct_reason,

				    cp->ct_explan);

			fc_disc_done(disc, DISC_EV_FAILED);

			event = DISC_EV_FAILED;

		} else {

			FC_DISC_DBG(disc, "GPN_FT unexpected response code "

				    "%x\n", ntohs(cp->ct_cmd));

		}

	} else if (fr_sof(fp) == FC_SOF_N3 &&

		   seq_cnt == disc->seq_count) {

		buf = fh + 1;

	} else if (fr_sof(fp) == FC_SOF_N3 && seq_cnt == disc->seq_count) {

		error = fc_disc_gpn_ft_parse(disc, fh + 1, len);

	} else {

		FC_DISC_DBG(disc, "GPN_FT unexpected frame - out of sequence? "

			    "seq_cnt %x expected %x sof %x eof %x\n",

			    seq_cnt, disc->seq_count, fr_sof(fp), fr_eof(fp));

	}

	if (buf) {

		disc->seq_count++;

		error = fc_disc_gpn_ft_parse(disc, buf, len);

	if (error)

		fc_disc_error(disc, fp);

	}

	else if (event != DISC_EV_NONE)

		fc_disc_done(disc, event);

	fc_frame_free(fp);



	mutex_unlock(&disc->disc_mutex);

}