--- drivers/scsi/ibmvscsi/ibmvfc.c

+++ drivers/scsi/ibmvscsi/ibmvfc.c

@@ -1969,7 +1969,7 @@ static int ibmvfc_wait_for_ops(struct ib

DECLARE_COMPLETION_ONSTACK(comp);

int wait;

unsigned long flags;

- signed long timeout = init_timeout * HZ;

+ signed long timeout = IBMVFC_ABORT_WAIT_TIMEOUT * HZ;

ENTER;

do {

@@ -2720,6 +2720,7 @@ static struct ibmvfc_async_crq *ibmvfc_n

if (crq->valid & 0x80) {

if (++async_crq->cur == async_crq->size)

async_crq->cur = 0;

+ rmb();

} else

crq = NULL;

@@ -2742,6 +2743,7 @@ static struct ibmvfc_crq *ibmvfc_next_cr

if (crq->valid & 0x80) {

if (++queue->cur == queue->size)

queue->cur = 0;

+ rmb();

} else

crq = NULL;

@@ -2790,12 +2792,14 @@ static void ibmvfc_tasklet(void *data)

while ((async = ibmvfc_next_async_crq(vhost)) != NULL) {

ibmvfc_handle_async(async, vhost);

async->valid = 0;

+ wmb();

}

/* Pull all the valid messages off the CRQ */

while ((crq = ibmvfc_next_crq(vhost)) != NULL) {

ibmvfc_handle_crq(crq, vhost);

crq->valid = 0;

+ wmb();

}

vio_enable_interrupts(vdev);

@@ -2803,10 +2807,12 @@ static void ibmvfc_tasklet(void *data)

vio_disable_interrupts(vdev);

ibmvfc_handle_async(async, vhost);

async->valid = 0;

+ wmb();

} else if ((crq = ibmvfc_next_crq(vhost)) != NULL) {

vio_disable_interrupts(vdev);

ibmvfc_handle_crq(crq, vhost);

crq->valid = 0;

+ wmb();

} else

done = 1;

}