OrangeFS: Change almost all instances of the string PVFS2 to OrangeFS.
OrangeFS was formerly known as PVFS2 and retains the name in many places. I leave the device /dev/pvfs2-req since this affects userspace. I leave the filesystem type pvfs2 since this affects userspace. Further the OrangeFS sysint library reads fstab for an entry of type pvfs2 independently of kernel mounts. I leave extended attribute keys user.pvfs2 and system.pvfs2 as the sysint library understands these. I leave references to userspace binaries still named pvfs2. I leave the filenames. Signed-off-by: Yi Liu <yi9@clemson.edu> [martin@omnibond.com: clairify above constraints and merge] Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
@@ -12,68 +12,68 @@
|
||||
* 32-64 bit interaction issues between
|
||||
* client-core and device
|
||||
*/
|
||||
struct pvfs2_io_request_s {
|
||||
struct orangefs_io_request_s {
|
||||
__s32 async_vfs_io;
|
||||
__s32 buf_index;
|
||||
__s32 count;
|
||||
__s32 __pad1;
|
||||
__s64 offset;
|
||||
struct pvfs2_object_kref refn;
|
||||
enum PVFS_io_type io_type;
|
||||
struct orangefs_object_kref refn;
|
||||
enum ORANGEFS_io_type io_type;
|
||||
__s32 readahead_size;
|
||||
};
|
||||
|
||||
struct pvfs2_lookup_request_s {
|
||||
struct orangefs_lookup_request_s {
|
||||
__s32 sym_follow;
|
||||
__s32 __pad1;
|
||||
struct pvfs2_object_kref parent_refn;
|
||||
char d_name[PVFS2_NAME_LEN];
|
||||
struct orangefs_object_kref parent_refn;
|
||||
char d_name[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_create_request_s {
|
||||
struct pvfs2_object_kref parent_refn;
|
||||
struct PVFS_sys_attr_s attributes;
|
||||
char d_name[PVFS2_NAME_LEN];
|
||||
struct orangefs_create_request_s {
|
||||
struct orangefs_object_kref parent_refn;
|
||||
struct ORANGEFS_sys_attr_s attributes;
|
||||
char d_name[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_symlink_request_s {
|
||||
struct pvfs2_object_kref parent_refn;
|
||||
struct PVFS_sys_attr_s attributes;
|
||||
char entry_name[PVFS2_NAME_LEN];
|
||||
char target[PVFS2_NAME_LEN];
|
||||
struct orangefs_symlink_request_s {
|
||||
struct orangefs_object_kref parent_refn;
|
||||
struct ORANGEFS_sys_attr_s attributes;
|
||||
char entry_name[ORANGEFS_NAME_LEN];
|
||||
char target[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_getattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_getattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__u32 mask;
|
||||
__u32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_setattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct PVFS_sys_attr_s attributes;
|
||||
struct orangefs_setattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
struct ORANGEFS_sys_attr_s attributes;
|
||||
};
|
||||
|
||||
struct pvfs2_remove_request_s {
|
||||
struct pvfs2_object_kref parent_refn;
|
||||
char d_name[PVFS2_NAME_LEN];
|
||||
struct orangefs_remove_request_s {
|
||||
struct orangefs_object_kref parent_refn;
|
||||
char d_name[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_mkdir_request_s {
|
||||
struct pvfs2_object_kref parent_refn;
|
||||
struct PVFS_sys_attr_s attributes;
|
||||
char d_name[PVFS2_NAME_LEN];
|
||||
struct orangefs_mkdir_request_s {
|
||||
struct orangefs_object_kref parent_refn;
|
||||
struct ORANGEFS_sys_attr_s attributes;
|
||||
char d_name[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_readdir_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_readdir_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__u64 token;
|
||||
__s32 max_dirent_count;
|
||||
__s32 buf_index;
|
||||
};
|
||||
|
||||
struct pvfs2_readdirplus_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_readdirplus_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__u64 token;
|
||||
__s32 max_dirent_count;
|
||||
__u32 mask;
|
||||
@@ -81,130 +81,130 @@ struct pvfs2_readdirplus_request_s {
|
||||
__s32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_rename_request_s {
|
||||
struct pvfs2_object_kref old_parent_refn;
|
||||
struct pvfs2_object_kref new_parent_refn;
|
||||
char d_old_name[PVFS2_NAME_LEN];
|
||||
char d_new_name[PVFS2_NAME_LEN];
|
||||
struct orangefs_rename_request_s {
|
||||
struct orangefs_object_kref old_parent_refn;
|
||||
struct orangefs_object_kref new_parent_refn;
|
||||
char d_old_name[ORANGEFS_NAME_LEN];
|
||||
char d_new_name[ORANGEFS_NAME_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_statfs_request_s {
|
||||
struct orangefs_statfs_request_s {
|
||||
__s32 fs_id;
|
||||
__s32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_truncate_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_truncate_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__s64 size;
|
||||
};
|
||||
|
||||
struct pvfs2_mmap_ra_cache_flush_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_mmap_ra_cache_flush_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
};
|
||||
|
||||
struct pvfs2_fs_mount_request_s {
|
||||
char pvfs2_config_server[PVFS_MAX_SERVER_ADDR_LEN];
|
||||
struct orangefs_fs_mount_request_s {
|
||||
char orangefs_config_server[ORANGEFS_MAX_SERVER_ADDR_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_fs_umount_request_s {
|
||||
struct orangefs_fs_umount_request_s {
|
||||
__s32 id;
|
||||
__s32 fs_id;
|
||||
char pvfs2_config_server[PVFS_MAX_SERVER_ADDR_LEN];
|
||||
char orangefs_config_server[ORANGEFS_MAX_SERVER_ADDR_LEN];
|
||||
};
|
||||
|
||||
struct pvfs2_getxattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_getxattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__s32 key_sz;
|
||||
__s32 __pad1;
|
||||
char key[PVFS_MAX_XATTR_NAMELEN];
|
||||
char key[ORANGEFS_MAX_XATTR_NAMELEN];
|
||||
};
|
||||
|
||||
struct pvfs2_setxattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct PVFS_keyval_pair keyval;
|
||||
struct orangefs_setxattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
struct ORANGEFS_keyval_pair keyval;
|
||||
__s32 flags;
|
||||
__s32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_listxattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_listxattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__s32 requested_count;
|
||||
__s32 __pad1;
|
||||
__u64 token;
|
||||
};
|
||||
|
||||
struct pvfs2_removexattr_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_removexattr_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
__s32 key_sz;
|
||||
__s32 __pad1;
|
||||
char key[PVFS_MAX_XATTR_NAMELEN];
|
||||
char key[ORANGEFS_MAX_XATTR_NAMELEN];
|
||||
};
|
||||
|
||||
struct pvfs2_op_cancel_s {
|
||||
struct orangefs_op_cancel_s {
|
||||
__u64 op_tag;
|
||||
};
|
||||
|
||||
struct pvfs2_fsync_request_s {
|
||||
struct pvfs2_object_kref refn;
|
||||
struct orangefs_fsync_request_s {
|
||||
struct orangefs_object_kref refn;
|
||||
};
|
||||
|
||||
enum pvfs2_param_request_type {
|
||||
PVFS2_PARAM_REQUEST_SET = 1,
|
||||
PVFS2_PARAM_REQUEST_GET = 2
|
||||
enum orangefs_param_request_type {
|
||||
ORANGEFS_PARAM_REQUEST_SET = 1,
|
||||
ORANGEFS_PARAM_REQUEST_GET = 2
|
||||
};
|
||||
|
||||
enum pvfs2_param_request_op {
|
||||
PVFS2_PARAM_REQUEST_OP_ACACHE_TIMEOUT_MSECS = 1,
|
||||
PVFS2_PARAM_REQUEST_OP_ACACHE_HARD_LIMIT = 2,
|
||||
PVFS2_PARAM_REQUEST_OP_ACACHE_SOFT_LIMIT = 3,
|
||||
PVFS2_PARAM_REQUEST_OP_ACACHE_RECLAIM_PERCENTAGE = 4,
|
||||
PVFS2_PARAM_REQUEST_OP_PERF_TIME_INTERVAL_SECS = 5,
|
||||
PVFS2_PARAM_REQUEST_OP_PERF_HISTORY_SIZE = 6,
|
||||
PVFS2_PARAM_REQUEST_OP_PERF_RESET = 7,
|
||||
PVFS2_PARAM_REQUEST_OP_NCACHE_TIMEOUT_MSECS = 8,
|
||||
PVFS2_PARAM_REQUEST_OP_NCACHE_HARD_LIMIT = 9,
|
||||
PVFS2_PARAM_REQUEST_OP_NCACHE_SOFT_LIMIT = 10,
|
||||
PVFS2_PARAM_REQUEST_OP_NCACHE_RECLAIM_PERCENTAGE = 11,
|
||||
PVFS2_PARAM_REQUEST_OP_STATIC_ACACHE_TIMEOUT_MSECS = 12,
|
||||
PVFS2_PARAM_REQUEST_OP_STATIC_ACACHE_HARD_LIMIT = 13,
|
||||
PVFS2_PARAM_REQUEST_OP_STATIC_ACACHE_SOFT_LIMIT = 14,
|
||||
PVFS2_PARAM_REQUEST_OP_STATIC_ACACHE_RECLAIM_PERCENTAGE = 15,
|
||||
PVFS2_PARAM_REQUEST_OP_CLIENT_DEBUG = 16,
|
||||
PVFS2_PARAM_REQUEST_OP_CCACHE_TIMEOUT_SECS = 17,
|
||||
PVFS2_PARAM_REQUEST_OP_CCACHE_HARD_LIMIT = 18,
|
||||
PVFS2_PARAM_REQUEST_OP_CCACHE_SOFT_LIMIT = 19,
|
||||
PVFS2_PARAM_REQUEST_OP_CCACHE_RECLAIM_PERCENTAGE = 20,
|
||||
PVFS2_PARAM_REQUEST_OP_CAPCACHE_TIMEOUT_SECS = 21,
|
||||
PVFS2_PARAM_REQUEST_OP_CAPCACHE_HARD_LIMIT = 22,
|
||||
PVFS2_PARAM_REQUEST_OP_CAPCACHE_SOFT_LIMIT = 23,
|
||||
PVFS2_PARAM_REQUEST_OP_CAPCACHE_RECLAIM_PERCENTAGE = 24,
|
||||
PVFS2_PARAM_REQUEST_OP_TWO_MASK_VALUES = 25,
|
||||
enum orangefs_param_request_op {
|
||||
ORANGEFS_PARAM_REQUEST_OP_ACACHE_TIMEOUT_MSECS = 1,
|
||||
ORANGEFS_PARAM_REQUEST_OP_ACACHE_HARD_LIMIT = 2,
|
||||
ORANGEFS_PARAM_REQUEST_OP_ACACHE_SOFT_LIMIT = 3,
|
||||
ORANGEFS_PARAM_REQUEST_OP_ACACHE_RECLAIM_PERCENTAGE = 4,
|
||||
ORANGEFS_PARAM_REQUEST_OP_PERF_TIME_INTERVAL_SECS = 5,
|
||||
ORANGEFS_PARAM_REQUEST_OP_PERF_HISTORY_SIZE = 6,
|
||||
ORANGEFS_PARAM_REQUEST_OP_PERF_RESET = 7,
|
||||
ORANGEFS_PARAM_REQUEST_OP_NCACHE_TIMEOUT_MSECS = 8,
|
||||
ORANGEFS_PARAM_REQUEST_OP_NCACHE_HARD_LIMIT = 9,
|
||||
ORANGEFS_PARAM_REQUEST_OP_NCACHE_SOFT_LIMIT = 10,
|
||||
ORANGEFS_PARAM_REQUEST_OP_NCACHE_RECLAIM_PERCENTAGE = 11,
|
||||
ORANGEFS_PARAM_REQUEST_OP_STATIC_ACACHE_TIMEOUT_MSECS = 12,
|
||||
ORANGEFS_PARAM_REQUEST_OP_STATIC_ACACHE_HARD_LIMIT = 13,
|
||||
ORANGEFS_PARAM_REQUEST_OP_STATIC_ACACHE_SOFT_LIMIT = 14,
|
||||
ORANGEFS_PARAM_REQUEST_OP_STATIC_ACACHE_RECLAIM_PERCENTAGE = 15,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CLIENT_DEBUG = 16,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CCACHE_TIMEOUT_SECS = 17,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CCACHE_HARD_LIMIT = 18,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CCACHE_SOFT_LIMIT = 19,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CCACHE_RECLAIM_PERCENTAGE = 20,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CAPCACHE_TIMEOUT_SECS = 21,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CAPCACHE_HARD_LIMIT = 22,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CAPCACHE_SOFT_LIMIT = 23,
|
||||
ORANGEFS_PARAM_REQUEST_OP_CAPCACHE_RECLAIM_PERCENTAGE = 24,
|
||||
ORANGEFS_PARAM_REQUEST_OP_TWO_MASK_VALUES = 25,
|
||||
};
|
||||
|
||||
struct pvfs2_param_request_s {
|
||||
enum pvfs2_param_request_type type;
|
||||
enum pvfs2_param_request_op op;
|
||||
struct orangefs_param_request_s {
|
||||
enum orangefs_param_request_type type;
|
||||
enum orangefs_param_request_op op;
|
||||
__s64 value;
|
||||
char s_value[PVFS2_MAX_DEBUG_STRING_LEN];
|
||||
char s_value[ORANGEFS_MAX_DEBUG_STRING_LEN];
|
||||
};
|
||||
|
||||
enum pvfs2_perf_count_request_type {
|
||||
PVFS2_PERF_COUNT_REQUEST_ACACHE = 1,
|
||||
PVFS2_PERF_COUNT_REQUEST_NCACHE = 2,
|
||||
PVFS2_PERF_COUNT_REQUEST_CAPCACHE = 3,
|
||||
enum orangefs_perf_count_request_type {
|
||||
ORANGEFS_PERF_COUNT_REQUEST_ACACHE = 1,
|
||||
ORANGEFS_PERF_COUNT_REQUEST_NCACHE = 2,
|
||||
ORANGEFS_PERF_COUNT_REQUEST_CAPCACHE = 3,
|
||||
};
|
||||
|
||||
struct pvfs2_perf_count_request_s {
|
||||
enum pvfs2_perf_count_request_type type;
|
||||
struct orangefs_perf_count_request_s {
|
||||
enum orangefs_perf_count_request_type type;
|
||||
__s32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_fs_key_request_s {
|
||||
struct orangefs_fs_key_request_s {
|
||||
__s32 fsid;
|
||||
__s32 __pad1;
|
||||
};
|
||||
|
||||
struct pvfs2_upcall_s {
|
||||
struct orangefs_upcall_s {
|
||||
__s32 type;
|
||||
__u32 uid;
|
||||
__u32 gid;
|
||||
@@ -215,31 +215,31 @@ struct pvfs2_upcall_s {
|
||||
char *trailer_buf;
|
||||
|
||||
union {
|
||||
struct pvfs2_io_request_s io;
|
||||
struct pvfs2_lookup_request_s lookup;
|
||||
struct pvfs2_create_request_s create;
|
||||
struct pvfs2_symlink_request_s sym;
|
||||
struct pvfs2_getattr_request_s getattr;
|
||||
struct pvfs2_setattr_request_s setattr;
|
||||
struct pvfs2_remove_request_s remove;
|
||||
struct pvfs2_mkdir_request_s mkdir;
|
||||
struct pvfs2_readdir_request_s readdir;
|
||||
struct pvfs2_readdirplus_request_s readdirplus;
|
||||
struct pvfs2_rename_request_s rename;
|
||||
struct pvfs2_statfs_request_s statfs;
|
||||
struct pvfs2_truncate_request_s truncate;
|
||||
struct pvfs2_mmap_ra_cache_flush_request_s ra_cache_flush;
|
||||
struct pvfs2_fs_mount_request_s fs_mount;
|
||||
struct pvfs2_fs_umount_request_s fs_umount;
|
||||
struct pvfs2_getxattr_request_s getxattr;
|
||||
struct pvfs2_setxattr_request_s setxattr;
|
||||
struct pvfs2_listxattr_request_s listxattr;
|
||||
struct pvfs2_removexattr_request_s removexattr;
|
||||
struct pvfs2_op_cancel_s cancel;
|
||||
struct pvfs2_fsync_request_s fsync;
|
||||
struct pvfs2_param_request_s param;
|
||||
struct pvfs2_perf_count_request_s perf_count;
|
||||
struct pvfs2_fs_key_request_s fs_key;
|
||||
struct orangefs_io_request_s io;
|
||||
struct orangefs_lookup_request_s lookup;
|
||||
struct orangefs_create_request_s create;
|
||||
struct orangefs_symlink_request_s sym;
|
||||
struct orangefs_getattr_request_s getattr;
|
||||
struct orangefs_setattr_request_s setattr;
|
||||
struct orangefs_remove_request_s remove;
|
||||
struct orangefs_mkdir_request_s mkdir;
|
||||
struct orangefs_readdir_request_s readdir;
|
||||
struct orangefs_readdirplus_request_s readdirplus;
|
||||
struct orangefs_rename_request_s rename;
|
||||
struct orangefs_statfs_request_s statfs;
|
||||
struct orangefs_truncate_request_s truncate;
|
||||
struct orangefs_mmap_ra_cache_flush_request_s ra_cache_flush;
|
||||
struct orangefs_fs_mount_request_s fs_mount;
|
||||
struct orangefs_fs_umount_request_s fs_umount;
|
||||
struct orangefs_getxattr_request_s getxattr;
|
||||
struct orangefs_setxattr_request_s setxattr;
|
||||
struct orangefs_listxattr_request_s listxattr;
|
||||
struct orangefs_removexattr_request_s removexattr;
|
||||
struct orangefs_op_cancel_s cancel;
|
||||
struct orangefs_fsync_request_s fsync;
|
||||
struct orangefs_param_request_s param;
|
||||
struct orangefs_perf_count_request_s perf_count;
|
||||
struct orangefs_fs_key_request_s fs_key;
|
||||
} req;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user