summaryrefslogtreecommitdiffstats
path: root/fs/orangefs/file.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-02-14 03:06:50 +0100
committerMike Marshall <hubcap@omnibond.com>2016-02-19 19:45:55 +0100
commit897c5df6cf8c10d2557c098641faa62f65ef8598 (patch)
tree6b081cc1edbf8cd5b108f868f2e944f01ee380e4 /fs/orangefs/file.c
parentorangefs_readdir_index_put(): get rid of bufmap argument (diff)
downloadlinux-897c5df6cf8c10d2557c098641faa62f65ef8598.tar.xz
linux-897c5df6cf8c10d2557c098641faa62f65ef8598.zip
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>
Diffstat (limited to 'fs/orangefs/file.c')
-rw-r--r--fs/orangefs/file.c6
1 files changed, 2 insertions, 4 deletions
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) {