The patch titled
git-scsi-target: ibmvscsi build fix
has been removed from the -mm tree. Its filename is
git-scsi-target-ibmvscsi-build-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: git-scsi-target: ibmvscsi build fix
From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
The following patch will update IBM VIO target driver for hvcall.h
changes.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/ibmvscsi/ibmvstgt.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN drivers/scsi/ibmvscsi/ibmvstgt.c~git-scsi-target-ibmvscsi-build-fix drivers/scsi/ibmvscsi/ibmvstgt.c
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c~git-scsi-target-ibmvscsi-build-fix
+++ a/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -238,7 +238,7 @@ static int ibmvstgt_rdma(struct iu_entry
vport->riobn,
md[i].va + mdone);
- if (err != H_Success) {
+ if (err != H_SUCCESS) {
eprintk("rdma error %d %d\n", dir, slen);
goto out;
}
@@ -325,7 +325,7 @@ int send_adapter_info(struct iu_entry *i
/* Get remote info */
err = h_copy_rdma(sizeof(*info), vport->riobn, remote_buffer,
vport->liobn, data_token);
- if (err == H_Success) {
+ if (err == H_SUCCESS) {
dprintk("Client connect: %s (%d)\n",
info->partition_name, info->partition_number);
}
@@ -346,7 +346,7 @@ int send_adapter_info(struct iu_entry *i
dma_free_coherent(target->dev, sizeof(*info), info, data_token);
- if (err != H_Success) {
+ if (err != H_SUCCESS) {
eprintk("Error sending adapter info %d\n", err);
return 1;
}
@@ -506,7 +506,7 @@ static void process_iu(struct viosrp_crq
err = h_copy_rdma(crq->IU_length, vport->riobn,
iue->remote_token, vport->liobn, iue->sbuf->dma);
- if (err != H_Success)
+ if (err != H_SUCCESS)
eprintk("%ld transferring data error %p\n", err, iue);
if (crq->format == VIOSRP_MAD_FORMAT)
@@ -552,16 +552,16 @@ static int crq_queue_create(struct crq_q
/* If the adapter was left active for some reason (like kexec)
* try freeing and re-registering
*/
- if (err == H_Resource) {
+ if (err == H_RESOURCE) {
do {
err = h_free_crq(vport->dma_dev->unit_address);
- } while (err == H_Busy || H_isLongBusy(err));
+ } while (err == H_BUSY || H_IS_LONG_BUSY(err));
err = h_reg_crq(vport->dma_dev->unit_address, queue->msg_token,
PAGE_SIZE);
}
- if (err != H_Success && err != 2) {
+ if (err != H_SUCCESS && err != 2) {
eprintk("Error 0x%x opening virtual adapter\n", err);
goto reg_crq_failed;
}
@@ -583,7 +583,7 @@ static int crq_queue_create(struct crq_q
req_irq_failed:
do {
err = h_free_crq(vport->dma_dev->unit_address);
- } while (err == H_Busy || H_isLongBusy(err));
+ } while (err == H_BUSY || H_IS_LONG_BUSY(err));
reg_crq_failed:
dma_unmap_single(target->dev, queue->msg_token,
@@ -604,7 +604,7 @@ static void crq_queue_destroy(struct srp
free_irq(vport->dma_dev->irq, target);
do {
err = h_free_crq(vport->dma_dev->unit_address);
- } while (err == H_Busy || H_isLongBusy(err));
+ } while (err == H_BUSY || H_IS_LONG_BUSY(err));
dma_unmap_single(target->dev, queue->msg_token,
queue->size * sizeof(*queue->msgs), DMA_BIDIRECTIONAL);
_
Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are
git-scsi-target.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
