diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
commit | 9b73e76f3cf63379dcf45fcd4f112f5812418d0a (patch) | |
tree | 4e6bef87cd0cd6d848fc39a5ae25b981dbbe035b /drivers/scsi/libsas/sas_scsi_host.c | |
parent | 50d9a126240f9961cfdd063336bbeb91f77a7dce (diff) | |
parent | 23c3e290fb9ce38cabc2822b47583fc8702411bf (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
[SCSI] usbstorage: use last_sector_bug flag universally
[SCSI] libsas: abstract STP task status into a function
[SCSI] ultrastor: clean up inline asm warnings
[SCSI] aic7xxx: fix firmware build
[SCSI] aacraid: fib context lock for management ioctls
[SCSI] ch: remove forward declarations
[SCSI] ch: fix device minor number management bug
[SCSI] ch: handle class_device_create failure properly
[SCSI] NCR5380: fix section mismatch
[SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
[SCSI] IB/iSER: add logical unit reset support
[SCSI] don't use __GFP_DMA for sense buffers if not required
[SCSI] use dynamically allocated sense buffer
[SCSI] scsi.h: add macro for enclosure bit of inquiry data
[SCSI] sd: add fix for devices with last sector access problems
[SCSI] fix pcmcia compile problem
[SCSI] aacraid: add Voodoo Lite class of cards.
[SCSI] aacraid: add new driver features flags
[SCSI] qla2xxx: Update version number to 8.02.00-k7.
[SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
...
Diffstat (limited to 'drivers/scsi/libsas/sas_scsi_host.c')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index a3fdc57e2673..f869fba86807 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
@@ -108,7 +108,7 @@ static void sas_scsi_task_done(struct sas_task *task) | |||
108 | break; | 108 | break; |
109 | case SAM_CHECK_COND: | 109 | case SAM_CHECK_COND: |
110 | memcpy(sc->sense_buffer, ts->buf, | 110 | memcpy(sc->sense_buffer, ts->buf, |
111 | max(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size)); | 111 | min(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size)); |
112 | stat = SAM_CHECK_COND; | 112 | stat = SAM_CHECK_COND; |
113 | break; | 113 | break; |
114 | default: | 114 | default: |
@@ -148,7 +148,6 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, | |||
148 | if (!task) | 148 | if (!task) |
149 | return NULL; | 149 | return NULL; |
150 | 150 | ||
151 | *(u32 *)cmd->sense_buffer = 0; | ||
152 | task->uldd_task = cmd; | 151 | task->uldd_task = cmd; |
153 | ASSIGN_SAS_TASK(cmd, task); | 152 | ASSIGN_SAS_TASK(cmd, task); |
154 | 153 | ||
@@ -200,6 +199,10 @@ int sas_queue_up(struct sas_task *task) | |||
200 | */ | 199 | */ |
201 | int sas_queuecommand(struct scsi_cmnd *cmd, | 200 | int sas_queuecommand(struct scsi_cmnd *cmd, |
202 | void (*scsi_done)(struct scsi_cmnd *)) | 201 | void (*scsi_done)(struct scsi_cmnd *)) |
202 | __releases(host->host_lock) | ||
203 | __acquires(dev->sata_dev.ap->lock) | ||
204 | __releases(dev->sata_dev.ap->lock) | ||
205 | __acquires(host->host_lock) | ||
203 | { | 206 | { |
204 | int res = 0; | 207 | int res = 0; |
205 | struct domain_device *dev = cmd_to_domain_dev(cmd); | 208 | struct domain_device *dev = cmd_to_domain_dev(cmd); |
@@ -410,7 +413,7 @@ static int sas_recover_I_T(struct domain_device *dev) | |||
410 | } | 413 | } |
411 | 414 | ||
412 | /* Find the sas_phy that's attached to this device */ | 415 | /* Find the sas_phy that's attached to this device */ |
413 | struct sas_phy *find_local_sas_phy(struct domain_device *dev) | 416 | static struct sas_phy *find_local_sas_phy(struct domain_device *dev) |
414 | { | 417 | { |
415 | struct domain_device *pdev = dev->parent; | 418 | struct domain_device *pdev = dev->parent; |
416 | struct ex_phy *exphy = NULL; | 419 | struct ex_phy *exphy = NULL; |