From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Oct 2008 17:53:26 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.28-rc1~732
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ef5bef357cdf49f3a386c7102dbf3be5f7e5c913

Merge git://git./linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (37 commits)
  [SCSI] zfcp: fix double dbf id usage
  [SCSI] zfcp: wait on SCSI work to be finished before proceeding with init dev
  [SCSI] zfcp: fix erp list usage without using locks
  [SCSI] zfcp: prevent fc_remote_port_delete calls for unregistered rport
  [SCSI] zfcp: fix deadlock caused by shared work queue tasks
  [SCSI] zfcp: put threshold data in hba trace
  [SCSI] zfcp: Simplify zfcp data structures
  [SCSI] zfcp: Simplify get_adapter_by_busid
  [SCSI] zfcp: remove all typedefs and replace them with standards
  [SCSI] zfcp: attach and release SAN nameserver port on demand
  [SCSI] zfcp: remove unused references, declarations and flags
  [SCSI] zfcp: Update message with input from review
  [SCSI] zfcp: add queue_full sysfs attribute
  [SCSI] scsi_dh: suppress comparison warning
  [SCSI] scsi_dh: add Dell product information into rdac device handler
  [SCSI] qla2xxx: remove the unused SCSI_QLOGIC_FC_FIRMWARE option
  [SCSI] qla2xxx: fix printk format warnings
  [SCSI] qla2xxx: Update version number to 8.02.01-k8.
  [SCSI] qla2xxx: Ignore payload reserved-bits during RSCN processing.
  [SCSI] qla2xxx: Additional residual-count corrections during UNDERRUN handling.
  ...
---

ef5bef357cdf49f3a386c7102dbf3be5f7e5c913
diff --cc drivers/scsi/scsi.c
index dbeb86cafc0d,762a8797e0be..2ac3cb2b9081
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@@ -668,15 -664,15 +668,16 @@@ int scsi_dispatch_cmd(struct scsi_cmnd 
  		goto out;
  	}
  
- 	/* Check to see if the scsi lld put this device into state SDEV_BLOCK. */
- 	if (unlikely(cmd->device->sdev_state == SDEV_BLOCK)) {
+ 	/* Check to see if the scsi lld made this device blocked. */
+ 	if (unlikely(scsi_device_blocked(cmd->device))) {
  		/* 
- 		 * in SDEV_BLOCK, the command is just put back on the device
- 		 * queue.  The suspend state has already blocked the queue so
- 		 * future requests should not occur until the device 
- 		 * transitions out of the suspend state.
+ 		 * in blocked state, the command is just put back on
+ 		 * the device queue.  The suspend state has already
+ 		 * blocked the queue so future requests should not
+ 		 * occur until the device transitions out of the
+ 		 * suspend state.
  		 */
 +
  		scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);
  
  		SCSI_LOG_MLQUEUE(3, printk("queuecommand : device blocked \n"));