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

Commit 61e87ab0 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/obd: move status files from procfs to debugfs 



change type of
* obd->obd_proc_entry
* obd->obd_svc_procroot
* lov->lov_pool_proc_entry
* obd_type->typ_procroot
* pool_desc->pool_proc_entry

Signed-off-by: default avatarDmitry Eremin <dmiter4ever@gmail.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82765049

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

+4 −0
Original line number Diff line number Diff line
@@ -565,6 +565,10 @@ extern int lprocfs_add_clear_entry(struct obd_device *obd, 
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 struct dentry *ldebugfs_add_simple(struct dentry *root,

					  char *name,

					  void *data,

					  struct file_operations *fops);

extern struct proc_dir_entry *lprocfs_add_simple(struct proc_dir_entry *root,

						char *name,

						void *data,

drivers/staging/lustre/lustre/include/obd.h

+5 −5
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ struct obd_type { 
	struct list_head typ_chain;

	struct obd_ops *typ_dt_ops;

	struct md_ops *typ_md_ops;

	struct proc_dir_entry *typ_procroot;

	struct dentry *typ_debugfs_entry;

	char *typ_name;

	int  typ_refcnt;

	struct lu_device_type *typ_lu;
@@ -545,7 +545,7 @@ struct pool_desc { 
	struct lov_qos_rr     pool_rr;		/* round robin qos */

	struct hlist_node      pool_hash;	      /* access by poolname */

	struct list_head	    pool_list;	      /* serial access */

	struct proc_dir_entry *pool_proc_entry;	/* file in /proc */

	struct dentry		*pool_debugfs_entry;	/* file in /proc */

	struct obd_device    *pool_lobd;	/* obd of the lov/lod to which

						*  this pool belongs */

};
@@ -566,7 +566,7 @@ struct lov_obd { 
	int		     lov_pool_count;

	struct cfs_hash	     *lov_pools_hash_body; /* used for key access */

	struct list_head	lov_pool_list; /* used for sequential access */

	struct proc_dir_entry   *lov_pool_proc_entry;

	struct dentry		*lov_pool_debugfs_entry;

	enum lustre_sec_part    lov_sp_me;



	/* Cached LRU pages from upper layer */
@@ -917,9 +917,9 @@ struct obd_device { 
	unsigned int	   md_cntr_base;

	struct lprocfs_stats  *md_stats;



	struct proc_dir_entry  *obd_proc_entry;

	struct dentry		*obd_debugfs_entry;

	struct proc_dir_entry  *obd_proc_exports_entry;

	struct proc_dir_entry  *obd_svc_procroot;

	struct dentry		*obd_svc_debugfs_entry;

	struct lprocfs_stats  *obd_svc_stats;

	atomic_t	   obd_evict_inprogress;

	wait_queue_head_t	    obd_evict_inprogress_waitq;

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+5 −9
Original line number Diff line number Diff line
@@ -1310,15 +1310,11 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg) 
	lprocfs_lmv_init_vars(&lvars);



	lprocfs_obd_setup(obd, lvars.obd_vars, lvars.sysfs_vars);

#if defined (CONFIG_PROC_FS)

	{

		rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",

	rc = ldebugfs_seq_create(obd->obd_debugfs_entry, "target_obd",

				 0444, &lmv_proc_target_fops, obd);

	if (rc)

		CWARN("%s: error adding LMV target_obd file: rc = %d\n",

		      obd->obd_name, rc);

       }

#endif

	rc = fld_client_init(&lmv->lmv_fld, obd->obd_name,

			     LUSTRE_CLI_FLD_HASH_DHT);

	if (rc) {

drivers/staging/lustre/lustre/lmv/lproc_lmv.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int lmv_target_seq_open(struct inode *inode, struct file *file) 
		return rc;



	seq = file->private_data;

	seq->private = PDE_DATA(inode);

	seq->private = inode->i_private;



	return 0;

}

drivers/staging/lustre/lustre/lov/lov_obd.c

+7 −12
Original line number Diff line number Diff line
@@ -810,20 +810,15 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg) 


	lprocfs_lov_init_vars(&lvars);

	lprocfs_obd_setup(obd, lvars.obd_vars, lvars.sysfs_vars);

#if defined (CONFIG_PROC_FS)

	{

		int rc1;



		rc1 = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",

	rc = ldebugfs_seq_create(obd->obd_debugfs_entry, "target_obd",

				 0444, &lov_proc_target_fops, obd);

		if (rc1)

	if (rc)

		CWARN("Error adding the target_obd file\n");

	}

#endif

	lov->lov_pool_proc_entry = lprocfs_register("pools",

						    obd->obd_proc_entry,

						    NULL, NULL);



	lov->lov_pool_debugfs_entry = ldebugfs_register("pools",

						     obd->obd_debugfs_entry,

						     NULL, NULL);

	return 0;



out: