Commit 02f74150 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge branch '5.9/scsi-fixes' into 5.10/scsi-ufs 



Resolve UFS discrepancies between fixes and queue.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 2de7649c 244359c9

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	}



	/* alloc the udl from per cpu ddp pool */

	ddp->udl = dma_pool_alloc(ddp_pool->pool, GFP_KERNEL, &ddp->udp);

	ddp->udl = dma_pool_alloc(ddp_pool->pool, GFP_ATOMIC, &ddp->udp);

	if (!ddp->udl) {

		e_err(drv, "failed allocated ddp context\n");

		goto out_noddp_unmap;

drivers/s390/scsi/zfcp_fsf.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void zfcp_fsf_req_complete(struct zfcp_fsf_req *req) 
		return;

	}



	del_timer(&req->timer);

	del_timer_sync(&req->timer);

	zfcp_fsf_protstatus_eval(req);

	zfcp_fsf_fsfstatus_eval(req);

	req->handler(req);
@@ -867,7 +867,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) 
	req->qdio_req.qdio_outb_usage = atomic_read(&qdio->req_q_free);

	req->issued = get_tod_clock();

	if (zfcp_qdio_send(qdio, &req->qdio_req)) {

		del_timer(&req->timer);

		del_timer_sync(&req->timer);

		/* lookup request again, list might have changed */

		zfcp_reqlist_find_rm(adapter->req_list, req_id);

		zfcp_erp_adapter_reopen(adapter, 0, "fsrs__1");

drivers/scsi/cxgbi/libcxgbi.c

+1 −1
Original line number Diff line number Diff line
@@ -2457,10 +2457,10 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task) 
		return err;

	}



	__kfree_skb(skb);

	log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,

		  "itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n",

		  task->itt, skb, skb->len, skb->data_len, err);

	__kfree_skb(skb);

	iscsi_conn_printk(KERN_ERR, task->conn, "xmit err %d.\n", err);

	iscsi_conn_failure(task->conn, ISCSI_ERR_XMIT_FAILED);

	return err;

drivers/scsi/libfc/fc_disc.c

+0 −2
Original line number Diff line number Diff line
@@ -634,8 +634,6 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp, 
	fc_frame_free(fp);

out:

	kref_put(&rdata->kref, fc_rport_destroy);

	if (!IS_ERR(fp))

		fc_frame_free(fp);

}



/**

drivers/scsi/libsas/sas_ata.c

+4 −1
Original line number Diff line number Diff line
@@ -209,6 +209,9 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) 
		task->num_scatter = si;

	}



	if (qc->tf.protocol == ATA_PROT_NODATA)

		task->data_dir = DMA_NONE;

	else

		task->data_dir = qc->dma_dir;

	task->scatter = qc->sg;

	task->ata_task.retry_count = 1;