Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

orangefs: get rid of op->done

Browse Source 
shouldn't be needed now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Al Viro 2016-02-13 21:06:50 -05:00 committed by Mike Marshall
parent 82d37f19ff
commit 897c5df6cf
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/orangefs/devorangefs-req.c
View File

@ -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);

6
fs/orangefs/file.c
View File

@ -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) {

2
fs/orangefs/orangefs-cache.c
View File

@ -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;

2
fs/orangefs/orangefs-kernel.h
View File

@ -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 */