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

Commit db7f7709 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Code cleanup, removing the goto statement 



Signed-off-by: default avatarJohn Soni Jose <sony.john-n@emulex.com>
Signed-off-by: default avatarJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c8b25598

drivers/scsi/be2iscsi/be_main.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -147,15 +147,15 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) 
	struct invalidate_command_table *inv_tbl;

	struct invalidate_command_table *inv_tbl;

	struct be_dma_mem nonemb_cmd;

	struct be_dma_mem nonemb_cmd;

	unsigned int cid, tag, i, num_invalidate;

	unsigned int cid, tag, i, num_invalidate;

	int rc = FAILED;





	/* invalidate iocbs */

	/* invalidate iocbs */

	cls_session = starget_to_session(scsi_target(sc->device));

	cls_session = starget_to_session(scsi_target(sc->device));

	session = cls_session->dd_data;

	session = cls_session->dd_data;

	spin_lock_bh(&session->lock);

	spin_lock_bh(&session->lock);

	if (!session->leadconn || session->state != ISCSI_STATE_LOGGED_IN)

	if (!session->leadconn || session->state != ISCSI_STATE_LOGGED_IN) {

		goto unlock;

		spin_unlock_bh(&session->lock);



		return FAILED;

	}

	conn = session->leadconn;

	conn = session->leadconn;

	beiscsi_conn = conn->dd_data;

	beiscsi_conn = conn->dd_data;

	phba = beiscsi_conn->phba;

	phba = beiscsi_conn->phba;
@@ -208,9 +208,6 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) 
	pci_free_consistent(phba->ctrl.pdev, nonemb_cmd.size,

	pci_free_consistent(phba->ctrl.pdev, nonemb_cmd.size,

			    nonemb_cmd.va, nonemb_cmd.dma);

			    nonemb_cmd.va, nonemb_cmd.dma);

	return iscsi_eh_device_reset(sc);

	return iscsi_eh_device_reset(sc);

unlock:

	spin_unlock_bh(&session->lock);

	return rc;

}

}





static ssize_t beiscsi_show_boot_tgt_info(void *data, int type, char *buf)

static ssize_t beiscsi_show_boot_tgt_info(void *data, int type, char *buf)