Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus

2014-06-09 07:49:39 -07:00
parent 63ff05910d e90b25fa40
commit b4c43993f4
111 changed files with 4509 additions and 2519 deletions
@@ -133,6 +133,15 @@ struct scsi_cmnd {
 	unsigned char tag;	/* SCSI-II queued command tag */
 };

+/*
+ * Return the driver private allocation behind the command.
+ * Only works if cmd_size is set in the host template.
+ */
+static inline void *scsi_cmd_priv(struct scsi_cmnd *cmd)
+{
+	return cmd + 1;
+}
+
 /* make sure not to use it with REQ_TYPE_BLOCK_PC commands */
 static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
 {