diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 12:24:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 12:24:16 +0200 |
| commit | cd32b1616bc79b2f2ce1b1c6164beecfecc2259c (patch) | |
| tree | 2e91c49b5c2bd927b9b74b7414dbb6839af601e1 /include/scsi/scsi_cmnd.h | |
| parent | 89b8835ec865dddd6673a8dd7003581bf2377176 (diff) | |
| parent | a720b2dd2470a52345df11dca8d6c1466599f812 (diff) | |
Merge tag 'l3-fix-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent
A small L3 cache index disable fix from Srivatsa Bhat which unifies the
way the code checks for already disabled indices.
( Pulling it into v3.4 despite the v3.5 tag - the fix is small and we better
keep the same code across kernel versions for such user facing interfaces. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/scsi/scsi_cmnd.h')
| -rw-r--r-- | include/scsi/scsi_cmnd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 377df4a28512..1e1198546c72 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -134,6 +134,9 @@ struct scsi_cmnd { static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd) { + if (!cmd->request->rq_disk) + return NULL; + return *(struct scsi_driver **)cmd->request->rq_disk->private_data; } |