From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 14 Feb 2016 02:06:50 +0000 (-0500)
Subject: orangefs: get rid of op->done
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=897c5df6cf8c10d2557c098641faa62f65ef8598;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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 790855a72e32..b27ed1cb9a36 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -424,19 +424,6 @@ 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);
-		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 3b1e9e83eb91..4eb009e8f19f 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -199,7 +199,7 @@ populate_shared_memory:
 		if (orangefs_cancel_op_in_progress(new_op))
 			return ret;
 
-		goto done_copying;
+		goto out;
 	}
 
 	/*
@@ -212,7 +212,7 @@ populate_shared_memory:
 				       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 @@ 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.
 	 */
-	complete(&new_op->done);
 
 out:
 	if (buffer_index >= 0) {
diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c
index 09194e69875f..817092a14429 100644
--- a/fs/orangefs/orangefs-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -122,8 +122,6 @@ struct orangefs_kernel_op_s *op_alloc(__s32 type)
 
 		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 8613d4166d0f..1d20eadaefd8 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -205,8 +205,6 @@ struct orangefs_kernel_op_s {
 	struct completion waitq;
 	spinlock_t lock;
 
-	struct completion done;
-
 	atomic_t ref_count;
 
 	/* VFS aio fields */