orangefs: get rid of op->done
shouldn't be needed now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index 790855a..b27ed1c 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -424,19 +424,6 @@
* 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);
- if (unlikely(n < 0)) {
- gossip_debug(GOSSIP_DEV_DEBUG,
- "%s: signal on I/O wait, aborting\n",
- __func__);
- } else if (unlikely(n == 0)) {
- gossip_debug(GOSSIP_DEV_DEBUG,
- "%s: timed out.\n",
- __func__);
- }
- }
out:
if (unlikely(op_is_cancel(op)))
put_cancel(op);
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 3b1e9e8..4eb009e 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -199,7 +199,7 @@
if (orangefs_cancel_op_in_progress(new_op))
return ret;
- goto done_copying;
+ goto out;
}
/*
@@ -212,7 +212,7 @@
iter,
new_op->downcall.resp.io.amt_complete);
if (ret < 0)
- goto done_copying;
+ goto out;
}
gossip_debug(GOSSIP_FILE_DEBUG,
"%s(%pU): Amount written as returned by the sys-io call:%d\n",
@@ -222,12 +222,10 @@
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.
*/
- complete(&new_op->done);
out:
if (buffer_index >= 0) {
diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c
index 09194e6..817092a 100644
--- a/fs/orangefs/orangefs-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -122,8 +122,6 @@
atomic_set(&new_op->ref_count, 1);
- init_completion(&new_op->done);
-
new_op->upcall.type = ORANGEFS_VFS_OP_INVALID;
new_op->downcall.type = ORANGEFS_VFS_OP_INVALID;
new_op->downcall.status = -1;
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 8613d41..1d20ead 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -205,8 +205,6 @@
struct completion waitq;
spinlock_t lock;
- struct completion done;
-
atomic_t ref_count;
/* VFS aio fields */