Pull SCSI fixes from James Bottomley: "This is a set of four bug fixes. The isci one is an obvious thinko (using request buffer instead of response buffer) which causes a command to fail. The three others are DIF/DIX updates which are required because they're part of a series of ten patches, the other seven of which went into the block layer during the merge window meaning our current DIF/DIX implementation is broken without these three. Signed-off-by: James Bottomley <JBottomley@Parallels.com>" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] sd: Implement support for WRITE SAME [SCSI] sd: Permit merged discard requests [SCSI] Add a report opcode helper [SCSI] isci: copy fis 0x34 response into proper buffer
Showing the changes to include (1 of 9 files). Show all
Unified · Split
| @@ -135,6 +135,8 @@ struct scsi_device { · 134 unmodified lines | ||
| 135 | 135 | * because we did a bus reset. */ |
| 136 | 136 | unsigned use_10_for_rw:1; /* first try 10-byte read / write */ |
| 137 | 137 | unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */ |
| 138 | + unsigned no_report_opcodes:1; /* no REPORT SUPPORTED OPERATION CODES */ | |
| 139 | + unsigned no_write_same:1; /* no WRITE SAME command */ | |
| 138 | 140 | unsigned skip_ms_page_8:1; /* do not use MODE SENSE page 0x08 */ |
| 139 | 141 | unsigned skip_ms_page_3f:1; /* do not use MODE SENSE page 0x3f */ |
| 140 | 142 | unsigned skip_vpd_pages:1; /* do not read VPD pages */ |
| @@ -362,6 +364,8 @@ extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, · 221 unmodified lines | ||
| 362 | 364 | int retries, struct scsi_sense_hdr *sshdr); |
| 363 | 365 | extern int scsi_get_vpd_page(struct scsi_device *, u8 page, unsigned char *buf, |
| 364 | 366 | int buf_len); |
| 367 | +extern int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer, | |
| 368 | + unsigned int len, unsigned char opcode); | |
| 365 | 369 | extern int scsi_device_set_state(struct scsi_device *sdev, |
| 366 | 370 | enum scsi_device_state state); |
| 367 | 371 | extern struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type, |