projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.41' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
include
/
scsi
/
scsi_cmnd.h
diff --git
a/include/scsi/scsi_cmnd.h
b/include/scsi/scsi_cmnd.h
index ac06cc595890ef87a8e01632f5872ab11e4057f2..de5f5d8f1f8a9b84e6b7306b51ac02e75821533f 100644
(file)
--- a/
include/scsi/scsi_cmnd.h
+++ b/
include/scsi/scsi_cmnd.h
@@
-132,18
+132,10
@@
struct scsi_cmnd {
unsigned char tag; /* SCSI-II queued command tag */
};
unsigned char tag; /* SCSI-II queued command tag */
};
+/* 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)
{
static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
{
- struct scsi_driver **sdp;
-
- if (!cmd->request->rq_disk)
- return NULL;
-
- sdp = (struct scsi_driver **)cmd->request->rq_disk->private_data;
- if (!sdp)
- return NULL;
-
- return *sdp;
+ return *(struct scsi_driver **)cmd->request->rq_disk->private_data;
}
extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
}
extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);