Commit 74ae6d6a authored by Karan Tilak Kumar's avatar Karan Tilak Kumar Committed by Martin K. Petersen
Browse files

scsi: fnic: Set scsi_set_resid() only for underflow 

Set scsi_set_resid() only if FCPIO_ICMND_CMPL_RESID_UNDER is set.

Link: https://lore.kernel.org/r/20201121015134.18872-1-kartilak@cisco.com


Reviewed-by: default avatarArulprabhu Ponnusamy <arulponn@cisco.com>
Co-developed-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 875d4eda

drivers/scsi/fnic/fnic.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define DRV_NAME		"fnic"

#define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"

#define DRV_VERSION		"1.6.0.51"

#define DRV_VERSION		"1.6.0.52"

#define PFX			DRV_NAME ": "

#define DFX                     DRV_NAME "%d: "

drivers/scsi/fnic/fnic_scsi.c

+3 −2
Original line number Diff line number Diff line
@@ -921,10 +921,11 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic, 
	case FCPIO_SUCCESS:

		sc->result = (DID_OK << 16) | icmnd_cmpl->scsi_status;

		xfer_len = scsi_bufflen(sc);

		scsi_set_resid(sc, icmnd_cmpl->residual);



		if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER)

		if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) {

			xfer_len -= icmnd_cmpl->residual;

			scsi_set_resid(sc, icmnd_cmpl->residual);

		}



		if (icmnd_cmpl->scsi_status == SAM_STAT_CHECK_CONDITION)

			atomic64_inc(&fnic_stats->misc_stats.check_condition);