Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2bcf28 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

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: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 47b4948f

fs/orangefs/file.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,6 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod 
		return -ENOMEM;

		return -ENOMEM;





	/* synchronous I/O */

	/* 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.readahead_size = readahead_size;

	new_op->upcall.req.io.io_type = type;

	new_op->upcall.req.io.io_type = type;

	new_op->upcall.req.io.refn = orangefs_inode->refn;

	new_op->upcall.req.io.refn = orangefs_inode->refn;

fs/orangefs/orangefs-kernel.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -100,14 +100,6 @@ enum orangefs_vfs_op_states { 
	OP_VFS_STATE_GIVEN_UP = 16,

	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

 * An array of client_debug_mask will be built to hold debug keyword/mask

 * values fetched from userspace.

 * values fetched from userspace.

fs/orangefs/upcall.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,10 +13,10 @@ 
 * client-core and device

 * client-core and device

 */

 */

struct orangefs_io_request_s {

struct orangefs_io_request_s {

	__s32 async_vfs_io;

	__s32 __pad1;

	__s32 buf_index;

	__s32 buf_index;

	__s32 count;

	__s32 count;

	__s32 __pad1;

	__s32 __pad2;

	__s64 offset;

	__s64 offset;

	struct orangefs_object_kref refn;

	struct orangefs_object_kref refn;

	enum ORANGEFS_io_type io_type;

	enum ORANGEFS_io_type io_type;