diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-02-20 14:26:01 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-02-24 17:07:50 -0500 |
| commit | 9c2bcf288ed7f600bc3f8e7541ea0522a8912bae (patch) | |
| tree | 245f765664b131be5a95c2c75f8a4d4372e2d374 | |
| parent | 47b4948fdb1055cd8d8f86aebb0b3fcb06ba36d5 (diff) | |
| download | linux-9c2bcf288ed7f600bc3f8e7541ea0522a8912bae.tar.gz | |
orangefs: remove vestigial async io code
I have verified that there is nothing in the userspace daemon version we are implementing this protocol against that ever looks at this field. Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
| -rw-r--r-- | fs/orangefs/file.c | 1 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-kernel.h | 8 | ||||
| -rw-r--r-- | fs/orangefs/upcall.h | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 4eb009e8f19f..399d5288dc1a 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -102,7 +102,6 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod return -ENOMEM; /* synchronous I/O */ - new_op->upcall.req.io.async_vfs_io = ORANGEFS_VFS_SYNC_IO; new_op->upcall.req.io.readahead_size = readahead_size; new_op->upcall.req.io.io_type = type; new_op->upcall.req.io.refn = orangefs_inode->refn; diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h index c3b3b22115eb..91cbd53f782c 100644 --- a/fs/orangefs/orangefs-kernel.h +++ b/fs/orangefs/orangefs-kernel.h @@ -101,14 +101,6 @@ enum orangefs_vfs_op_states { }; /* - * Defines for controlling whether I/O upcalls are for async or sync operations - */ -enum ORANGEFS_async_io_type { - ORANGEFS_VFS_SYNC_IO = 0, - ORANGEFS_VFS_ASYNC_IO = 1, -}; - -/* * An array of client_debug_mask will be built to hold debug keyword/mask * values fetched from userspace. */ diff --git a/fs/orangefs/upcall.h b/fs/orangefs/upcall.h index af6dcac180ab..001b20239407 100644 --- a/fs/orangefs/upcall.h +++ b/fs/orangefs/upcall.h @@ -13,10 +13,10 @@ * client-core and device */ struct orangefs_io_request_s { - __s32 async_vfs_io; + __s32 __pad1; __s32 buf_index; __s32 count; - __s32 __pad1; + __s32 __pad2; __s64 offset; struct orangefs_object_kref refn; enum ORANGEFS_io_type io_type; |