Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Martin Brandenburg and committed by
Mike Marshall
9c2bcf28 47b4948f

+2 -11
-1
fs/orangefs/file.c
··· 102 102 return -ENOMEM; 103 103 104 104 /* synchronous I/O */ 105 - new_op->upcall.req.io.async_vfs_io = ORANGEFS_VFS_SYNC_IO; 106 105 new_op->upcall.req.io.readahead_size = readahead_size; 107 106 new_op->upcall.req.io.io_type = type; 108 107 new_op->upcall.req.io.refn = orangefs_inode->refn;
-8
fs/orangefs/orangefs-kernel.h
··· 101 101 }; 102 102 103 103 /* 104 - * Defines for controlling whether I/O upcalls are for async or sync operations 105 - */ 106 - enum ORANGEFS_async_io_type { 107 - ORANGEFS_VFS_SYNC_IO = 0, 108 - ORANGEFS_VFS_ASYNC_IO = 1, 109 - }; 110 - 111 - /* 112 104 * An array of client_debug_mask will be built to hold debug keyword/mask 113 105 * values fetched from userspace. 114 106 */
+2 -2
fs/orangefs/upcall.h
··· 13 13 * client-core and device 14 14 */ 15 15 struct orangefs_io_request_s { 16 - __s32 async_vfs_io; 16 + __s32 __pad1; 17 17 __s32 buf_index; 18 18 __s32 count; 19 - __s32 __pad1; 19 + __s32 __pad2; 20 20 __s64 offset; 21 21 struct orangefs_object_kref refn; 22 22 enum ORANGEFS_io_type io_type;