Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a50e2cc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents c7868048 c9526497

drivers/scsi/ibmvscsi/ibmvscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, 
void ibmvscsi_release_crq_queue(struct crq_queue *queue,

				struct ibmvscsi_host_data *hostdata,

				int max_requests);

void ibmvscsi_reset_crq_queue(struct crq_queue *queue,

int ibmvscsi_reset_crq_queue(struct crq_queue *queue,

			      struct ibmvscsi_host_data *hostdata);



void ibmvscsi_handle_crq(struct viosrp_crq *crq,

drivers/scsi/ibmvscsi/iseries_vscsi.c

+2 −1
Original line number Diff line number Diff line
@@ -117,9 +117,10 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue, 
 *

 * no-op for iSeries

 */

void ibmvscsi_reset_crq_queue(struct crq_queue *queue,

int ibmvscsi_reset_crq_queue(struct crq_queue *queue,

			      struct ibmvscsi_host_data *hostdata)

{

	return 0;

}



/**

drivers/scsi/ibmvscsi/rpa_vscsi.c

+7 −1
Original line number Diff line number Diff line
@@ -230,6 +230,11 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, 
	rc = plpar_hcall_norets(H_REG_CRQ,

				vdev->unit_address,

				queue->msg_token, PAGE_SIZE);

	if (rc == H_Resource) 

		/* maybe kexecing and resource is busy. try a reset */

		rc = ibmvscsi_reset_crq_queue(queue,

					      hostdata);



	if (rc == 2) {

		/* Adapter is good, but other end is not ready */

		printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n");
@@ -281,7 +286,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, 
 * @hostdata:	ibmvscsi_host_data of host

 *

 */

void ibmvscsi_reset_crq_queue(struct crq_queue *queue,

int ibmvscsi_reset_crq_queue(struct crq_queue *queue,

			      struct ibmvscsi_host_data *hostdata)

{

	int rc;
@@ -309,4 +314,5 @@ void ibmvscsi_reset_crq_queue(struct crq_queue *queue, 
		printk(KERN_WARNING

		       "ibmvscsi: couldn't register crq--rc 0x%x\n", rc);

	}

	return rc;

}

drivers/scsi/megaraid.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy) 
					sg->offset;

			} else

				buf = cmd->request_buffer;

			memset(cmd->request_buffer, 0, cmd->cmnd[4]);

			memset(buf, 0, cmd->cmnd[4]);

			if (cmd->use_sg) {

				struct scatterlist *sg;

drivers/scsi/qla2xxx/qla_def.h

+1 −9
Original line number Diff line number Diff line
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host { 
 */

#define LOOP_TRANSITION(ha) \

	(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \

	 test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))



#define LOOP_NOT_READY(ha) \

	((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \

	  test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \

	 test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \

	  test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \

	 atomic_read(&ha->loop_state) == LOOP_DOWN)



#define LOOP_RDY(ha)	(!LOOP_NOT_READY(ha))



#define TGT_Q(ha, t) (ha->otgt[t])



#define to_qla_host(x)		((scsi_qla_host_t *) (x)->hostdata)