summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-06-09 16:49:39 +0200
committerJames Bottomley <JBottomley@Parallels.com>2014-06-09 16:49:39 +0200
commitb4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch)
tree7cc19990b0b00226ce3063d956790368bfe62ada /include/scsi
parentinclude/scsi/osd_protocol.h: remove unnecessary __constant (diff)
parentmvsas: Recognise device/subsystem 9485/9485 as 88SE9485 (diff)
downloadlinux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.xz
linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_cmnd.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index dd7c998221b3..e016e2ac38df 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -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)
{