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

Commit b59fe845 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove proc_dir_entry_t typedef 



Use struct proc_dir_entry like the rest of the kernel does.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9733ac33

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −5
Original line number Diff line number Diff line
@@ -80,9 +80,4 @@ LL_PROC_PROTO(name) \ 
				 __##name);	     \

}



/*

 * Proc file system APIs

 */

typedef struct proc_dir_entry	   proc_dir_entry_t;



#endif

drivers/staging/lustre/lustre/fld/fld_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -190,5 +190,5 @@ fld_target_name(struct lu_fld_target *tar) 
	return (const char *)tar->ft_exp->exp_obd->obd_name;

}



extern proc_dir_entry_t *fld_type_proc_dir;

extern struct proc_dir_entry *fld_type_proc_dir;

#endif /* __FLD_INTERNAL_H */

drivers/staging/lustre/lustre/fld/fld_request.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ int fld_client_del_target(struct lu_client_fld *fld, __u64 idx) 
EXPORT_SYMBOL(fld_client_del_target);



#ifdef LPROCFS

proc_dir_entry_t *fld_type_proc_dir = NULL;

struct proc_dir_entry *fld_type_proc_dir = NULL;



static int fld_client_proc_init(struct lu_client_fld *fld)

{

drivers/staging/lustre/lustre/include/lprocfs_status.h

+15 −15
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ enum { 


#define EXTRA_FIRST_OPC LDLM_GLIMPSE_ENQUEUE

/* class_obd.c */

extern proc_dir_entry_t *proc_lustre_root;

extern struct proc_dir_entry *proc_lustre_root;



struct obd_device;

struct obd_histogram;
@@ -550,11 +550,11 @@ extern void lprocfs_free_md_stats(struct obd_device *obddev); 
struct obd_export;

struct nid_stat;

extern int lprocfs_add_clear_entry(struct obd_device * obd,

				   proc_dir_entry_t *entry);

				   struct proc_dir_entry *entry);

extern int lprocfs_exp_setup(struct obd_export *exp,

			     lnet_nid_t *peer_nid, int *newnid);

extern int lprocfs_exp_cleanup(struct obd_export *exp);

extern proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root,

extern struct proc_dir_entry *lprocfs_add_simple(struct proc_dir_entry *root,

						char *name,

						void *data,

						struct file_operations *fops);
@@ -567,27 +567,27 @@ lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, 
			      unsigned long count, void *data);

extern int lprocfs_nid_stats_clear_read(struct seq_file *m, void *data);



extern int lprocfs_register_stats(proc_dir_entry_t *root, const char *name,

extern int lprocfs_register_stats(struct proc_dir_entry *root, const char *name,

				  struct lprocfs_stats *stats);



/* lprocfs_status.c */

extern int lprocfs_add_vars(proc_dir_entry_t *root,

extern int lprocfs_add_vars(struct proc_dir_entry *root,

			    struct lprocfs_vars *var,

			    void *data);



extern proc_dir_entry_t *lprocfs_register(const char *name,

					      proc_dir_entry_t *parent,

extern struct proc_dir_entry *lprocfs_register(const char *name,

					      struct proc_dir_entry *parent,

					      struct lprocfs_vars *list,

					      void *data);



extern void lprocfs_remove(proc_dir_entry_t **root);

extern void lprocfs_remove(struct proc_dir_entry **root);

extern void lprocfs_remove_proc_entry(const char *name,

				      struct proc_dir_entry *parent);



extern int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list);

extern int lprocfs_obd_cleanup(struct obd_device *obd);



extern int lprocfs_seq_create(proc_dir_entry_t *parent, const char *name,

extern int lprocfs_seq_create(struct proc_dir_entry *parent, const char *name,

			      umode_t mode,

			      const struct file_operations *seq_fops,

			      void *data);
@@ -838,7 +838,7 @@ static inline void lprocfs_clear_stats(struct lprocfs_stats *stats) 
{ return; }

static inline void lprocfs_free_stats(struct lprocfs_stats **stats)

{ return; }

static inline int lprocfs_register_stats(proc_dir_entry_t *root,

static inline int lprocfs_register_stats(struct proc_dir_entry *root,

					 const char *name,

					 struct lprocfs_stats *stats)

{ return 0; }
@@ -869,7 +869,7 @@ static inline int lprocfs_exp_setup(struct obd_export *exp,lnet_nid_t *peer_nid, 
{ return 0; }

static inline int lprocfs_exp_cleanup(struct obd_export *exp)

{ return 0; }

static inline proc_dir_entry_t *

static inline struct proc_dir_entry *

lprocfs_add_simple(struct proc_dir_entry *root, char *name,

		   void *data, struct file_operations *fops)

{return 0; }
@@ -887,15 +887,15 @@ static inline 
int lprocfs_nid_stats_clear_read(struct seq_file *m, void *data)

{ return 0; }



static inline proc_dir_entry_t *

lprocfs_register(const char *name, proc_dir_entry_t *parent,

static inline struct proc_dir_entry *

lprocfs_register(const char *name, struct proc_dir_entry *parent,

		 struct lprocfs_vars *list, void *data)

{ return NULL; }

static inline int lprocfs_add_vars(proc_dir_entry_t *root,

static inline int lprocfs_add_vars(struct proc_dir_entry *root,

				   struct lprocfs_vars *var,

				   void *data)

{ return 0; }

static inline void lprocfs_remove(proc_dir_entry_t **root)

static inline void lprocfs_remove(struct proc_dir_entry **root)

{ return; }

static inline void lprocfs_remove_proc_entry(const char *name,

					     struct proc_dir_entry *parent)

drivers/staging/lustre/lustre/include/lustre_dlm.h

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ struct ldlm_pool_ops { 
 */

struct ldlm_pool {

	/** Pool proc directory. */

	proc_dir_entry_t	*pl_proc_dir;

	struct proc_dir_entry	*pl_proc_dir;

	/** Pool name, must be long enough to hold compound proc entry name. */

	char			pl_name[100];

	/** Lock for protecting SLV/CLV updates. */