Commit 9237f04e authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: core: Fix scsi_get/set_resid() interface 

struct scsi_cmnd cmd->req.resid_len which is returned and set respectively
by the helper functions scsi_get_resid() and scsi_set_resid() is an
unsigned int. Reflect this fact in the interface of these helper functions.

Also fix compilation errors due to min() and max() type mismatch introduced
by this change in scsi debug code, usb transport code and in the USB ENE
card reader driver.

Link: https://lore.kernel.org/r/20191030090847.25650-1-damien.lemoal@wdc.com


Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 61951a6d

drivers/scsi/scsi_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd *scp, unsigned char *arr, 
static int p_fill_from_dev_buffer(struct scsi_cmnd *scp, const void *arr,

				  int arr_len, unsigned int off_dst)

{

	int act_len, n;

	unsigned int act_len, n;

	struct scsi_data_buffer *sdb = &scp->sdb;

	off_t skip = off_dst;
@@ -1039,7 +1039,7 @@ static int p_fill_from_dev_buffer(struct scsi_cmnd *scp, const void *arr, 
	pr_debug("%s: off_dst=%u, scsi_bufflen=%u, act_len=%u, resid=%d\n",

		 __func__, off_dst, scsi_bufflen(scp), act_len,

		 scsi_get_resid(scp));

	n = (int)scsi_bufflen(scp) - ((int)off_dst + act_len);

	n = scsi_bufflen(scp) - (off_dst + act_len);

	scsi_set_resid(scp, min(scsi_get_resid(scp), n));

	return 0;

}

drivers/usb/storage/ene_ub6250.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int ene_send_scsi_cmd(struct us_data *us, u8 fDir, void *buf, int use_sg) 
		residue = min(residue, transfer_length);

		if (us->srb != NULL)

			scsi_set_resid(us->srb, max(scsi_get_resid(us->srb),

								(int)residue));

								residue));

	}



	if (bcs->Status != US_BULK_STAT_OK)

drivers/usb/storage/transport.c

+1 −2
Original line number Diff line number Diff line
@@ -1284,8 +1284,7 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us) 


		} else {

			residue = min(residue, transfer_length);

			scsi_set_resid(srb, max(scsi_get_resid(srb),

			                                       (int) residue));

			scsi_set_resid(srb, max(scsi_get_resid(srb), residue));

		}

	}

include/scsi/scsi_cmnd.h

+2 −2
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd) 
	return cmd->sdb.length;

}



static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid)

static inline void scsi_set_resid(struct scsi_cmnd *cmd, unsigned int resid)

{

	cmd->req.resid_len = resid;

}



static inline int scsi_get_resid(struct scsi_cmnd *cmd)

static inline unsigned int scsi_get_resid(struct scsi_cmnd *cmd)

{

	return cmd->req.resid_len;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE