RE: [PATCH 1/3] scsi: storvsc: Miscellaneous code cleanups

From: Michael Kelley
Date: Wed Jun 16 2021 - 15:54:44 EST


From: Martin K. Petersen <martin.petersen@xxxxxxxxxx> Sent: Tuesday, June 15, 2021 7:25 PM
>
> Michael,
>
> > As general cleanup and in preparation for subsequent patches:
>
> Applied 1-3 to 5.14/scsi-staging.
>
> Since Hannes' series has deprecated status_byte() and CHECK_CONDITION I
> had to tweak that portion. Please verify my conflict resolution.
>

Unfortunately, it's not quite right. The line of code in question needs to be

if ((vstor_packet->vm_srb.scsi_status & 0xFF) == SAM_STAT_CHECK_CONDITION &&

The status_byte() helper was doing the masking as well as the right shift, so the
masking will need to be open coded. The replacement get_status_byte() helper
won't work here because it's based on a scsi_cmnd structure.

Michael