Commit 20f4cad6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] fix use-after-free in scsi_init_io()
  [SCSI] sd: fix medium-removal bug
  [SCSI] qla2xxx: Update version number to 8.03.04-k0.
  [SCSI] qla2xxx: Check for empty slot in request queue before posting Command type 6 request.
  [SCSI] qla2xxx: Cover UNDERRUN case where SCSI status is set.
  [SCSI] qla2xxx: Correctly set fw hung and complete only waiting mbx.
  [SCSI] qla2xxx: Reset seconds_since_last_heartbeat correctly.
  [SCSI] qla2xxx: make rport deletions explicit during vport removal
  [SCSI] qla2xxx: Fix vport delete issues
  [SCSI] sd, sym53c8xx: Remove warnings after vsprintf %pV introducation.
  [SCSI] Fix warning: zero-length gnu_printf format string
  [SCSI] hpsa: disable doorbell reset on reset_devices
  [SCSI] be2iscsi: Fix for Login failure
  [SCSI] fix bio.bi_rw handling
parents 002e473d 3a5c19c2

drivers/scsi/be2iscsi/be_iscsi.c

+2 −3
Original line number Diff line number Diff line
@@ -300,8 +300,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost, 
			   enum iscsi_host_param param, char *buf)

{

	struct beiscsi_hba *phba = (struct beiscsi_hba *)iscsi_host_priv(shost);

	int len = 0;

	int status;

	int status = 0;



	SE_DEBUG(DBG_LVL_8, "In beiscsi_get_host_param, param= %d\n", param);

	switch (param) {
@@ -315,7 +314,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost, 
	default:

		return iscsi_host_get_param(shost, param, buf);

	}

	return len;

	return status;

}



int beiscsi_get_macaddr(char *buf, struct beiscsi_hba *phba)

drivers/scsi/be2iscsi/be_mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int mgmt_open_connection(struct beiscsi_hba *phba, 
	memset(req, 0, sizeof(*req));

	wrb->tag0 |= tag;



	be_wrb_hdr_prepare(wrb, sizeof(*req), true, 1);

	be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1);

	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI,

			   OPCODE_COMMON_ISCSI_TCP_CONNECT_AND_OFFLOAD,

			   sizeof(*req));

drivers/scsi/hpsa.c

+6 −0
Original line number Diff line number Diff line
@@ -3231,6 +3231,12 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) 
	misc_fw_support = readl(&cfgtable->misc_fw_support);

	use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;



	/* The doorbell reset seems to cause lockups on some Smart

	 * Arrays (e.g. P410, P410i, maybe others).  Until this is

	 * fixed or at least isolated, avoid the doorbell reset.

	 */

	use_doorbell = 0;



	rc = hpsa_controller_hard_reset(pdev, vaddr, use_doorbell);

	if (rc)

		goto unmap_cfgtable;

drivers/scsi/osd/osd_initiator.c

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ void osd_req_read(struct osd_request *or, 
{

	_osd_req_encode_common(or, OSD_ACT_READ, obj, offset, len);

	WARN_ON(or->in.bio || or->in.total_bytes);

	WARN_ON(1 == (bio->bi_rw & REQ_WRITE));

	WARN_ON(bio->bi_rw & REQ_WRITE);

	or->in.bio = bio;

	or->in.total_bytes = len;

}

drivers/scsi/qla2xxx/qla_attr.c

+15 −8
Original line number Diff line number Diff line
@@ -1838,26 +1838,33 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) 


	qla24xx_disable_vp(vha);



	vha->flags.delete_progress = 1;



	fc_remove_host(vha->host);



	scsi_remove_host(vha->host);



	qla2x00_free_fcports(vha);

	if (vha->timer_active) {

		qla2x00_vp_stop_timer(vha);

		DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]"

		" = %p has stopped\n", vha->host_no, vha->vp_idx, vha));

	}



	qla24xx_deallocate_vp_id(vha);



	/* No pending activities shall be there on the vha now */

	DEBUG(msleep(random32()%10));  /* Just to see if something falls on

					* the net we have placed below */



	BUG_ON(atomic_read(&vha->vref_count));



	qla2x00_free_fcports(vha);



	mutex_lock(&ha->vport_lock);

	ha->cur_vport_count--;

	clear_bit(vha->vp_idx, ha->vp_idx_map);

	mutex_unlock(&ha->vport_lock);



	if (vha->timer_active) {

		qla2x00_vp_stop_timer(vha);

		DEBUG15(printk ("scsi(%ld): timer for the vport[%d] = %p "

		    "has stopped\n",

		    vha->host_no, vha->vp_idx, vha));

        }



	if (vha->req->id && !ha->flags.cpu_affinity_enabled) {

		if (qla25xx_delete_req_que(vha, vha->req) != QLA_SUCCESS)

			qla_printk(KERN_WARNING, ha,

CRA Git | Maintained and supported by SUSTech CRA and CCSE