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

Commit 51d648af authored by Akinobu Mita's avatar Akinobu Mita Committed by James Bottomley
Browse files

[SCSI] scsi_debug: fix sparse warnings related to data integrity field 



Each member in data integrity field tuple is big-endian.  But the
endianness of the values being compared with these members are not
annotated.  So this fixes these sparse warnings.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 68aee7ba

drivers/scsi/scsi_debug.c

+8 −11
Original line number Diff line number Diff line
@@ -1745,25 +1745,22 @@ static int do_device_access(struct scsi_cmnd *scmd, 
	return ret;

}



static u16 dif_compute_csum(const void *buf, int len)

static __be16 dif_compute_csum(const void *buf, int len)

{

	u16 csum;

	__be16 csum;



	switch (scsi_debug_guard) {

	case 1:

		csum = ip_compute_csum(buf, len);

		break;

	case 0:

	if (scsi_debug_guard)

		csum = (__force __be16)ip_compute_csum(buf, len);

	else

		csum = cpu_to_be16(crc_t10dif(buf, len));

		break;

	}



	return csum;

}



static int dif_verify(struct sd_dif_tuple *sdt, const void *data,

		      sector_t sector, u32 ei_lba)

{

	u16 csum = dif_compute_csum(data, scsi_debug_sector_size);

	__be16 csum = dif_compute_csum(data, scsi_debug_sector_size);



	if (sdt->guard_tag != csum) {

		pr_err("%s: GUARD check failed on sector %lu rcvd 0x%04x, data 0x%04x\n",
@@ -1841,7 +1838,7 @@ static int prot_verify_read(struct scsi_cmnd *SCpnt, sector_t start_sec, 
		sector = start_sec + i;

		sdt = dif_store(sector);



		if (sdt->app_tag == 0xffff)

		if (sdt->app_tag == cpu_to_be16(0xffff))

			continue;



		ret = dif_verify(sdt, fake_store(sector), sector, ei_lba);