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>

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 4eb009e8f19f89163316bcddb7e633a0a75acfd0..399d5288dc1a4a144c147a7ee1a0b6a9addb9403 100644 (file)
--- 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 c3b3b22115ebe06bc85346590861935d8bcdeb23..91cbd53f782c1aba79347d016c214b5a51f7d722 100644 (file)
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -100,14 +100,6 @@ enum orangefs_vfs_op_states {
        OP_VFS_STATE_GIVEN_UP = 16,
 };
 
-/*
- * 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 af6dcac180ab1d366c7f6ce2981733e7d353575d..001b20239407c5e6ea99056aaeca4268fb01a810 100644 (file)
--- 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;