scsi_lib_dma.c : fix bug /w dma mpas on virtual vc ports
PATCH 1/1 scsi_lib_dma.c : fix bug /w dma mpas on virtual vc ports
James,
This patch was originally posted 10/7/2008. It hasn't been picked up yet. Please incorporate the patch.
The original threads are at:
http://marc.info/?l=linux-scsi&m=122339015023134&w=2
http://marc.info/?l=linux-scsi&m=122338653014680&w=2
-- james s
Signed-off-by James Smart <[email protected]>
---
drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_lib_dma.c | 7 +++++-- include/scsi/scsi_host.h | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)
drivers/scsi/scsi_lib.c +1 -1
@@ -1611,7 +1611,7 @@ struct request_queue *__scsi_alloc_queue request_fn_proc *request_fn) {struct request_queue *q; -struct device *dev = shost->shost_gendev.parent; +struct device *dev =dev_to_nonscsi_dev (shost->shost_gendev.parent); q =blk_init_queue (request_fn,NULL );if (!q)
drivers/scsi/scsi_lib_dma.c +5 -2
@@ -23,7 +23,8 @@ int scsi_dma_map(struct scsi_cmnd *cmd)int nseg =0 ;if (scsi_sg_count (cmd)) { -struct device *dev = cmd->device->host->shost_gendev.parent; +struct device *dev =dev_to_nonscsi_dev ( + cmd->device->host->shost_gendev.parent); nseg =dma_map_sg (dev,scsi_sglist (cmd),scsi_sg_count (cmd), cmd->sc_data_direction);
@@ -41,10 +42,12 @@ EXPORT_SYMBOL(scsi_dma_map);void scsi_dma_unmap (struct scsi_cmnd *cmd) {if (scsi_sg_count (cmd)) { -struct device *dev = cmd->device->host->shost_gendev.parent; +struct device *dev =dev_to_nonscsi_dev ( + cmd->device->host->shost_gendev.parent);dma_unmap_sg (dev,scsi_sglist (cmd),scsi_sg_count (cmd), cmd->sc_data_direction); } }EXPORT_SYMBOL (scsi_dma_unmap); +
include/scsi/scsi_host.h +15 -0
@@ -698,6 +698,10 @@ static inline void *shost_priv(struct Scint scsi_is_host_device (const struct device *); +/* +* walks object list backward, to find the first shost object. +* Skips over transport objects that may not be stargets, etc +*/ static inline struct Scsi_Host *dev_to_shost (struct device *dev) {while (!scsi_is_host_device (dev)) {
@@ -708,6 +712,17 @@ static inline struct Scsi_Host *dev_to_s return container_of(dev, struct Scsi_Host, shost_gendev); } +/* +* walks object list backward, to find the first non-scsi object +* Skips over transport objects that may be vports, shosts under vports, etc +*/ +static inline struct device *dev_to_nonscsi_dev (struct device *dev) +{ +while (dev->type ==NULL ||scsi_is_host_device (dev)) + dev = dev->parent; +return dev; +} +static inline int scsi_host_in_recovery (struct Scsi_Host *shost) { return shost->shost_state == SHOST_RECOVERY ||