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

Commit 87a2d34b authored by Roel Kluin's avatar Roel Kluin Committed by James Bottomley
Browse files

[SCSI] fnic: remove redundant BUG_ONs and fix checks on unsigned 



The shost sg tablesize is set to FNIC_MAX_SG_DESC_CNT and fnic uses
scsi_dma_map, so both BUG_ONs can be removed.

scsi_dma_map may return -ENOMEM, sg_count should be int to catch that.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent e08afeb7

drivers/scsi/fnic/fnic_scsi.c

+2 −5
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic, 
					  struct vnic_wq_copy *wq,

					  struct fnic_io_req *io_req,

					  struct scsi_cmnd *sc,

					  u32 sg_count)

					  int sg_count)

{

	struct scatterlist *sg;

	struct fc_rport *rport = starget_to_rport(scsi_target(sc->device));
@@ -260,9 +260,6 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic, 
	char msg[2];



	if (sg_count) {

		BUG_ON(sg_count < 0);

		BUG_ON(sg_count > FNIC_MAX_SG_DESC_CNT);



		/* For each SGE, create a device desc entry */

		desc = io_req->sgl_list;

		for_each_sg(scsi_sglist(sc), sg, sg_count, i) {
@@ -344,7 +341,7 @@ int fnic_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
	struct fnic *fnic;

	struct vnic_wq_copy *wq;

	int ret;

	u32 sg_count;

	int sg_count;

	unsigned long flags;

	unsigned long ptr;