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

Commit 209469d9 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: remove unused code 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent bdd6f083

fs/orangefs/orangefs-debug.h

+0 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ 
#define GOSSIP_MAX_NR                 16

#define GOSSIP_MAX_DEBUG              (((__u64)1 << GOSSIP_MAX_NR) - 1)



/*function prototypes*/

__u64 ORANGEFS_kmod_eventlog_to_mask(const char *event_logging);

__u64 ORANGEFS_debug_eventlog_to_mask(const char *event_logging);

char *ORANGEFS_debug_mask_to_eventlog(__u64 mask);

char *ORANGEFS_kmod_mask_to_eventlog(__u64 mask);



/* a private internal type */

struct __keyword_mask_s {

	const char *keyword;

fs/orangefs/orangefs-kernel.h

+0 −77
Original line number Diff line number Diff line
@@ -65,11 +65,7 @@ 
#define ORANGEFS_REQDEVICE_NAME          "pvfs2-req"



#define ORANGEFS_DEVREQ_MAGIC             0x20030529

#define ORANGEFS_LINK_MAX                 0x000000FF

#define ORANGEFS_PURGE_RETRY_COUNT     0x00000005

#define ORANGEFS_MAX_NUM_OPTIONS          0x00000004

#define ORANGEFS_MAX_MOUNT_OPT_LEN        0x00000080

#define ORANGEFS_MAX_FSKEY_LEN            64



#define MAX_DEV_REQ_UPSIZE (2 * sizeof(__s32) +   \

sizeof(__u64) + sizeof(struct orangefs_upcall_s))
@@ -112,15 +108,6 @@ extern const struct xattr_handler *orangefs_xattr_handlers[]; 
extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type);

extern int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type);



/*

 * Redefine xtvec structure so that we could move helper functions out of

 * the define

 */

struct xtvec {

	__kernel_off_t xtv_off;		/* must be off_t */

	__kernel_size_t xtv_len;	/* must be size_t */

};



/*

 * orangefs data structures

 */
@@ -224,39 +211,6 @@ struct orangefs_sb_info_s { 
	struct list_head list;

};



/*

 * structure that holds the state of any async I/O operation issued

 * through the VFS. Needed especially to handle cancellation requests

 * or even completion notification so that the VFS client-side daemon

 * can free up its vfs_request slots.

 */

struct orangefs_kiocb_s {

	/* the pointer to the task that initiated the AIO */

	struct task_struct *tsk;



	/* pointer to the kiocb that kicked this operation */

	struct kiocb *kiocb;



	/* buffer index that was used for the I/O */

	struct orangefs_bufmap *bufmap;

	int buffer_index;



	/* orangefs kernel operation type */

	struct orangefs_kernel_op_s *op;



	/* set to indicate the type of the operation */

	int rw;



	/* file offset */

	loff_t offset;



	/* and the count in bytes */

	size_t bytes_to_be_copied;



	ssize_t bytes_copied;

	int needs_cleanup;

};



struct orangefs_stats {

	unsigned long cache_hits;

	unsigned long cache_misses;
@@ -305,21 +259,6 @@ static inline struct orangefs_khandle *get_khandle_from_ino(struct inode *inode) 
	return &(ORANGEFS_I(inode)->refn.khandle);

}



static inline ino_t get_ino_from_khandle(struct inode *inode)

{

	struct orangefs_khandle *khandle;

	ino_t ino;



	khandle = get_khandle_from_ino(inode);

	ino = orangefs_khandle_to_ino(khandle);

	return ino;

}



static inline ino_t get_parent_ino_from_dentry(struct dentry *dentry)

{

	return get_ino_from_khandle(dentry->d_parent->d_inode);

}



static inline int is_root_handle(struct inode *inode)

{

	gossip_debug(GOSSIP_DCACHE_DEBUG,
@@ -391,7 +330,6 @@ void fsid_key_table_finalize(void); 
/*

 * defined in inode.c

 */

__u32 convert_to_orangefs_mask(unsigned long lite_mask);

struct inode *orangefs_new_inode(struct super_block *sb,

			      struct inode *dir,

			      int mode,
@@ -410,17 +348,6 @@ int orangefs_update_time(struct inode *, struct timespec *, int); 
/*

 * defined in xattr.c

 */

int orangefs_setxattr(struct dentry *dentry,

		   const char *name,

		   const void *value,

		   size_t size,

		   int flags);



ssize_t orangefs_getxattr(struct dentry *dentry,

		       const char *name,

		       void *buffer,

		       size_t size);



ssize_t orangefs_listxattr(struct dentry *dentry, char *buffer, size_t size);



/*
@@ -467,8 +394,6 @@ int orangefs_inode_check_changed(struct inode *inode); 


int orangefs_inode_setattr(struct inode *inode, struct iattr *iattr);



int orangefs_unmount_sb(struct super_block *sb);



bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op);



int orangefs_normalize_to_errno(__s32 error_code);
@@ -493,8 +418,6 @@ extern const struct inode_operations orangefs_dir_inode_operations; 
extern const struct file_operations orangefs_dir_operations;

extern const struct dentry_operations orangefs_dentry_operations;



extern wait_queue_head_t orangefs_bufmap_init_waitq;



/*

 * misc convenience macros

 */

fs/orangefs/protocol.h

+0 −45
Original line number Diff line number Diff line
@@ -5,11 +5,6 @@ 
#include <linux/slab.h>

#include <linux/ioctl.h>



/* pvfs2-config.h ***********************************************************/

#define ORANGEFS_VERSION_MAJOR 2

#define ORANGEFS_VERSION_MINOR 9

#define ORANGEFS_VERSION_SUB 0



/* khandle stuff  ***********************************************************/



/*
@@ -70,16 +65,6 @@ static inline void ORANGEFS_khandle_from(struct orangefs_khandle *kh, 
}



/* pvfs2-types.h ************************************************************/

typedef __u32 ORANGEFS_uid;

typedef __u32 ORANGEFS_gid;

typedef __s32 ORANGEFS_fs_id;

typedef __u32 ORANGEFS_permissions;

typedef __u64 ORANGEFS_time;

typedef __s64 ORANGEFS_size;

typedef __u64 ORANGEFS_flags;

typedef __u64 ORANGEFS_ds_position;

typedef __s32 ORANGEFS_error;

typedef __s64 ORANGEFS_offset;



#define ORANGEFS_SUPER_MAGIC 0x20030528
@@ -145,7 +130,6 @@ typedef __s64 ORANGEFS_offset; 
#define ORANGEFS_APPEND_FL    FS_APPEND_FL

#define ORANGEFS_NOATIME_FL   FS_NOATIME_FL

#define ORANGEFS_MIRROR_FL    0x01000000ULL

#define ORANGEFS_O_EXECUTE (1 << 0)

#define ORANGEFS_FS_ID_NULL       ((__s32)0)

#define ORANGEFS_ATTR_SYS_UID                   (1 << 0)

#define ORANGEFS_ATTR_SYS_GID                   (1 << 1)
@@ -229,35 +213,6 @@ enum orangefs_ds_type { 
	ORANGEFS_TYPE_INTERNAL = (1 << 5)	/* for the server's private use */

};



/*

 * ORANGEFS_certificate simply stores a buffer with the buffer size.

 * The buffer can be converted to an OpenSSL X509 struct for use.

 */

struct ORANGEFS_certificate {

	__u32 buf_size;

	unsigned char *buf;

};



/*

 * A credential identifies a user and is signed by the client/user

 * private key.

 */

struct ORANGEFS_credential {

	__u32 userid;	/* user id */

	__u32 num_groups;	/* length of group_array */

	__u32 *group_array;	/* groups for which the user is a member */

	char *issuer;		/* alias of the issuing server */

	__u64 timeout;	/* seconds after epoch to time out */

	__u32 sig_size;	/* length of the signature in bytes */

	unsigned char *signature;	/* digital signature */

	struct ORANGEFS_certificate certificate;	/* user certificate buffer */

};

#define extra_size_ORANGEFS_credential (ORANGEFS_REQ_LIMIT_GROUPS	*	\

				    sizeof(__u32)		+	\

				    ORANGEFS_REQ_LIMIT_ISSUER	+	\

				    ORANGEFS_REQ_LIMIT_SIGNATURE	+	\

				    extra_size_ORANGEFS_certificate)



/* This structure is used by the VFS-client interaction alone */

struct ORANGEFS_keyval_pair {

	char key[ORANGEFS_MAX_XATTR_NAMELEN];