History

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley: "Three small bug fixes (barrier elimination, memory leak on unload, spinlock recursion) and a technical enhancement left over from the merge window: the TCMU read length support is required for tape devices read when the length of the read is greater than the tape block size" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: scsi_debug: Fix memory leak on module unload scsi: qla2xxx: Spinlock recursion in qla_target scsi: ipr: Eliminate duplicate barriers scsi: target: tcmu: add read length support

Linus Torvalds committed 8 years ago

Commit debd52a2 parents c92067a 52ab9765 files · +43 −16Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/target_core_user.h+3−1
@@ -44,6 +44,7 @@ · 43 unmodified lines
44#define TCMU_MAILBOX_VERSION 244#define TCMU_MAILBOX_VERSION 2
45#define ALIGN_SIZE 64 /* Should be enough for most CPUs */45#define ALIGN_SIZE 64 /* Should be enough for most CPUs */
46#define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */46#define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */
47#define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */
47 48
48struct tcmu_mailbox {49struct tcmu_mailbox {
49 __u16 version;50 __u16 version;
@@ -71,6 +72,7 @@ struct tcmu_cmd_entry_hdr { · 21 unmodified lines
71 __u16 cmd_id;72 __u16 cmd_id;
72 __u8 kflags;73 __u8 kflags;
73#define TCMU_UFLAG_UNKNOWN_OP 0x174#define TCMU_UFLAG_UNKNOWN_OP 0x1
75#define TCMU_UFLAG_READ_LEN 0x2
74 __u8 uflags;76 __u8 uflags;
75 77
76} __packed;78} __packed;
@@ -119,7 +121,7 @@ struct tcmu_cmd_entry { · 42 unmodified lines
119 __u8 scsi_status;121 __u8 scsi_status;
120 __u8 __pad1;122 __u8 __pad1;
121 __u16 __pad2;123 __u16 __pad2;
122 __u32 __pad3;124 __u32 read_len;
123 char sense_buffer[TCMU_SENSE_BUFFERSIZE];125 char sense_buffer[TCMU_SENSE_BUFFERSIZE];
124 } rsp;126 } rsp;
125 };127 };