@@ -421,6 +421,7 @@ wakeup:
* application reading/writing this device to return until
* the buffers are done being used.
*/
+/*
if (op->downcall.type == ORANGEFS_VFS_OP_FILE_IO) {
long n = wait_for_completion_interruptible_timeout(&op->done,
op_timeout_secs * HZ);
@@ -434,6 +435,7 @@ wakeup:
__func__);
}
}
+*/
out:
op_release(op);
return ret;
@@ -245,15 +245,9 @@ populate_shared_memory:
buffer_index,
iter,
new_op->downcall.resp.io.amt_complete);
- if (ret < 0) {
- /*
- * put error codes in downcall so that handle_io_error()
- * preserves it properly
- */
- new_op->downcall.status = ret;
- handle_io_error();
- goto out;
- }
+gossip_err("%s: I GOT HERE, ret:%zd:\n", __func__, ret);
+ if (ret < 0)
+ goto done_copying;
}
gossip_debug(GOSSIP_FILE_DEBUG,
"%s(%pU): Amount written as returned by the sys-io call:%d\n",
@@ -263,6 +257,8 @@ populate_shared_memory:
ret = new_op->downcall.resp.io.amt_complete;
+done_copying:
+
/*
* tell the device file owner waiting on I/O that this read has
* completed and it can return now.