From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Wed, 22 Nov 2006 18:06:44 +0000 (-0600)
Subject: Merge ../scsi-rc-fixes-2.6
X-Git-Tag: v2.6.20-rc1~34^2~20^2~41^2~51
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd2af46839ad6262d25714a6ec0365db9d6b98f;p=linux-2.6

Merge ../scsi-rc-fixes-2.6
---

0bd2af46839ad6262d25714a6ec0365db9d6b98f
diff --cc drivers/scsi/aic94xx/aic94xx_scb.c
index 52c6ea4fbf,b15caf1c8f..14d5d8c2ee
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@@ -497,8 -466,25 +568,9 @@@ static void escb_tasklet_complete(struc
  		asd_turn_led(asd_ha, phy_id, 0);
  		/* the device is gone */
  		sas_phy_disconnected(sas_phy);
+ 		asd_deform_port(asd_ha, phy);
  		sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
  		break;
 -	case REQ_TASK_ABORT:
 -		ASD_DPRINTK("%s: phy%d: REQ_TASK_ABORT\n", __FUNCTION__,
 -			    phy_id);
 -		break;
 -	case REQ_DEVICE_RESET:
 -		ASD_DPRINTK("%s: phy%d: REQ_DEVICE_RESET\n", __FUNCTION__,
 -			    phy_id);
 -		break;
 -	case SIGNAL_NCQ_ERROR:
 -		ASD_DPRINTK("%s: phy%d: SIGNAL_NCQ_ERROR\n", __FUNCTION__,
 -			    phy_id);
 -		break;
 -	case CLEAR_NCQ_ERROR:
 -		ASD_DPRINTK("%s: phy%d: CLEAR_NCQ_ERROR\n", __FUNCTION__,
 -			    phy_id);
 -		break;
  	default:
  		ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __FUNCTION__,
  			    phy_id, sb_opcode);
diff --cc drivers/scsi/scsi_lib.c
index ee35a62bb7,3ac4890ce0..2f12f9f12f
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -1087,39 -1081,11 +1088,39 @@@ static void scsi_blk_pc_done(struct scs
  	scsi_io_completion(cmd, cmd->request_bufflen);
  }
  
 -static void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd)
 +static int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
  {
 -	struct request *req = cmd->request;
 +	struct scsi_cmnd *cmd;
 +
 +	cmd = scsi_get_cmd_from_req(sdev, req);
 +	if (unlikely(!cmd))
 +		return BLKPREP_DEFER;
 +
 +	/*
 +	 * BLOCK_PC requests may transfer data, in which case they must
 +	 * a bio attached to them.  Or they might contain a SCSI command
 +	 * that does not transfer data, in which case they may optionally
 +	 * submit a request without an attached bio.
 +	 */
 +	if (req->bio) {
 +		int ret;
 +
 +		BUG_ON(!req->nr_phys_segments);
 +
 +		ret = scsi_init_io(cmd);
 +		if (unlikely(ret))
 +			return ret;
 +	} else {
 +		BUG_ON(req->data_len);
 +		BUG_ON(req->data);
 +
 +		cmd->request_bufflen = 0;
 +		cmd->request_buffer = NULL;
 +		cmd->use_sg = 0;
 +		req->buffer = NULL;
 +	}
  
- 	BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
+ 	BUILD_BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
  	memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
  	cmd->cmd_len = req->cmd_len;
  	if (!req->data_len)