diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-08-27 14:16:59 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-08-28 13:14:57 -0700 |
| commit | ee14c674e8fc57251223054fb52dc0ecfe711028 (patch) | |
| tree | 6f65bb8fd2380c4abed006139c8d6c820ae3d08f /drivers/scsi/scsi_lib.c | |
| parent | d95dbff2a41e934cd8789734b34dc591e78ba11c (diff) | |
| download | linux-stable-ee14c674e8fc57251223054fb52dc0ecfe711028.tar.gz linux-stable-ee14c674e8fc57251223054fb52dc0ecfe711028.tar.bz2 linux-stable-ee14c674e8fc57251223054fb52dc0ecfe711028.zip | |
scsi_dh: kill struct scsi_dh_data
Add a ->handler and a ->handler_data field to struct scsi_device and kill
this indirection. Also move struct scsi_device_handler to scsi_dh.h so that
changes to it don't require rebuilding every SCSI LLDD.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 882864f5cbae..cbfc5990052b 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -31,6 +31,7 @@ #include <scsi/scsi_driver.h> #include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_dh.h> #include <trace/events/scsi.h> @@ -1248,9 +1249,8 @@ static int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req) { struct scsi_cmnd *cmd = req->special; - if (unlikely(sdev->scsi_dh_data && sdev->scsi_dh_data->scsi_dh - && sdev->scsi_dh_data->scsi_dh->prep_fn)) { - int ret = sdev->scsi_dh_data->scsi_dh->prep_fn(sdev, req); + if (unlikely(sdev->handler && sdev->handler->prep_fn)) { + int ret = sdev->handler->prep_fn(sdev, req); if (ret != BLKPREP_OK) return ret; } |