Commit 5e7a3ed9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Linus Torvalds
Browse files

ocfs2: further debugfs cleanups 

There is no need to check return value of debugfs_create functions, but
the last sweep through ocfs missed a number of places where this was
happening.  There is also no need to save the individual dentries for the
debugfs files, as everything is can just be removed at once when the
directory is removed.

By getting rid of the file dentries for the debugfs entries, a bit of
local memory can be saved as well.

[colin.king@canonical.com: ensure ret is set to zero before returning]
  Link: http://lkml.kernel.org/r/20190807121929.28918-1-colin.king@canonical.com
Link: http://lkml.kernel.org/r/20190731132119.GA12603@kroah.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jia Guo <guojia12@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 963abb9a

fs/ocfs2/blockcheck.c

+11 −15
Original line number Diff line number Diff line
@@ -231,14 +231,6 @@ static int blockcheck_u64_get(void *data, u64 *val) 
}

DEFINE_SIMPLE_ATTRIBUTE(blockcheck_fops, blockcheck_u64_get, NULL, "%llu\n");



static struct dentry *blockcheck_debugfs_create(const char *name,

						struct dentry *parent,

						u64 *value)

{

	return debugfs_create_file(name, S_IFREG | S_IRUSR, parent, value,

				   &blockcheck_fops);

}



static void ocfs2_blockcheck_debug_remove(struct ocfs2_blockcheck_stats *stats)

{

	if (stats) {
@@ -250,16 +242,20 @@ static void ocfs2_blockcheck_debug_remove(struct ocfs2_blockcheck_stats *stats) 
static void ocfs2_blockcheck_debug_install(struct ocfs2_blockcheck_stats *stats,

					   struct dentry *parent)

{

	stats->b_debug_dir = debugfs_create_dir("blockcheck", parent);

	struct dentry *dir;



	dir = debugfs_create_dir("blockcheck", parent);

	stats->b_debug_dir = dir;



	debugfs_create_file("blocks_checked", S_IFREG | S_IRUSR, dir,

			    &stats->b_check_count, &blockcheck_fops);



	blockcheck_debugfs_create("blocks_checked", stats->b_debug_dir,

				  &stats->b_check_count);

	debugfs_create_file("checksums_failed", S_IFREG | S_IRUSR, dir,

			    &stats->b_failure_count, &blockcheck_fops);



	blockcheck_debugfs_create("checksums_failed", stats->b_debug_dir,

				  &stats->b_failure_count);

	debugfs_create_file("ecc_recoveries", S_IFREG | S_IRUSR, dir,

			    &stats->b_recover_count, &blockcheck_fops);



	blockcheck_debugfs_create("ecc_recoveries", stats->b_debug_dir,

				  &stats->b_recover_count);

}

#else

static inline void ocfs2_blockcheck_debug_install(struct ocfs2_blockcheck_stats *stats,

fs/ocfs2/cluster/heartbeat.c

+27 −76
Original line number Diff line number Diff line
@@ -225,10 +225,6 @@ struct o2hb_region { 
	unsigned int		hr_region_num;



	struct dentry		*hr_debug_dir;

	struct dentry		*hr_debug_livenodes;

	struct dentry		*hr_debug_regnum;

	struct dentry		*hr_debug_elapsed_time;

	struct dentry		*hr_debug_pinned;

	struct o2hb_debug_buf	*hr_db_livenodes;

	struct o2hb_debug_buf	*hr_db_regnum;

	struct o2hb_debug_buf	*hr_db_elapsed_time;
@@ -1394,21 +1390,20 @@ void o2hb_exit(void) 
	kfree(o2hb_db_failedregions);

}



static struct dentry *o2hb_debug_create(const char *name, struct dentry *dir,

					struct o2hb_debug_buf **db, int db_len,

					int type, int size, int len, void *data)

static void o2hb_debug_create(const char *name, struct dentry *dir,

			      struct o2hb_debug_buf **db, int db_len, int type,

			      int size, int len, void *data)

{

	*db = kmalloc(db_len, GFP_KERNEL);

	if (!*db)

		return NULL;

		return;



	(*db)->db_type = type;

	(*db)->db_size = size;

	(*db)->db_len = len;

	(*db)->db_data = data;



	return debugfs_create_file(name, S_IFREG|S_IRUSR, dir, *db,

				   &o2hb_debug_fops);

	debugfs_create_file(name, S_IFREG|S_IRUSR, dir, *db, &o2hb_debug_fops);

}



static void o2hb_debug_init(void)
@@ -1525,11 +1520,7 @@ static void o2hb_region_release(struct config_item *item) 


	kfree(reg->hr_slots);



	debugfs_remove(reg->hr_debug_livenodes);

	debugfs_remove(reg->hr_debug_regnum);

	debugfs_remove(reg->hr_debug_elapsed_time);

	debugfs_remove(reg->hr_debug_pinned);

	debugfs_remove(reg->hr_debug_dir);

	debugfs_remove_recursive(reg->hr_debug_dir);

	kfree(reg->hr_db_livenodes);

	kfree(reg->hr_db_regnum);

	kfree(reg->hr_db_elapsed_time);
@@ -1988,69 +1979,33 @@ static struct o2hb_heartbeat_group *to_o2hb_heartbeat_group(struct config_group 
		: NULL;

}



static int o2hb_debug_region_init(struct o2hb_region *reg, struct dentry *dir)

static void o2hb_debug_region_init(struct o2hb_region *reg,

				   struct dentry *parent)

{

	int ret = -ENOMEM;

	struct dentry *dir;



	reg->hr_debug_dir =

		debugfs_create_dir(config_item_name(&reg->hr_item), dir);

	if (!reg->hr_debug_dir) {

		mlog_errno(ret);

		goto bail;

	}

	dir = debugfs_create_dir(config_item_name(&reg->hr_item), parent);

	reg->hr_debug_dir = dir;



	reg->hr_debug_livenodes =

			o2hb_debug_create(O2HB_DEBUG_LIVENODES,

					  reg->hr_debug_dir,

					  &(reg->hr_db_livenodes),

	o2hb_debug_create(O2HB_DEBUG_LIVENODES, dir, &(reg->hr_db_livenodes),

			  sizeof(*(reg->hr_db_livenodes)),

			  O2HB_DB_TYPE_REGION_LIVENODES,

					  sizeof(reg->hr_live_node_bitmap),

					  O2NM_MAX_NODES, reg);

	if (!reg->hr_debug_livenodes) {

		mlog_errno(ret);

		goto bail;

	}

			  sizeof(reg->hr_live_node_bitmap), O2NM_MAX_NODES,

			  reg);



	reg->hr_debug_regnum =

			o2hb_debug_create(O2HB_DEBUG_REGION_NUMBER,

					  reg->hr_debug_dir,

					  &(reg->hr_db_regnum),

	o2hb_debug_create(O2HB_DEBUG_REGION_NUMBER, dir, &(reg->hr_db_regnum),

			  sizeof(*(reg->hr_db_regnum)),

					  O2HB_DB_TYPE_REGION_NUMBER,

					  0, O2NM_MAX_NODES, reg);

	if (!reg->hr_debug_regnum) {

		mlog_errno(ret);

		goto bail;

	}

			  O2HB_DB_TYPE_REGION_NUMBER, 0, O2NM_MAX_NODES, reg);



	reg->hr_debug_elapsed_time =

			o2hb_debug_create(O2HB_DEBUG_REGION_ELAPSED_TIME,

					  reg->hr_debug_dir,

	o2hb_debug_create(O2HB_DEBUG_REGION_ELAPSED_TIME, dir,

			  &(reg->hr_db_elapsed_time),

			  sizeof(*(reg->hr_db_elapsed_time)),

					  O2HB_DB_TYPE_REGION_ELAPSED_TIME,

					  0, 0, reg);

	if (!reg->hr_debug_elapsed_time) {

		mlog_errno(ret);

		goto bail;

	}

			  O2HB_DB_TYPE_REGION_ELAPSED_TIME, 0, 0, reg);



	reg->hr_debug_pinned =

			o2hb_debug_create(O2HB_DEBUG_REGION_PINNED,

					  reg->hr_debug_dir,

					  &(reg->hr_db_pinned),

	o2hb_debug_create(O2HB_DEBUG_REGION_PINNED, dir, &(reg->hr_db_pinned),

			  sizeof(*(reg->hr_db_pinned)),

					  O2HB_DB_TYPE_REGION_PINNED,

					  0, 0, reg);

	if (!reg->hr_debug_pinned) {

		mlog_errno(ret);

		goto bail;

	}

			  O2HB_DB_TYPE_REGION_PINNED, 0, 0, reg);



	ret = 0;

bail:

	return ret;

}



static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *group,
@@ -2106,11 +2061,7 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g 
	if (ret)

		goto unregister_handler;



	ret = o2hb_debug_region_init(reg, o2hb_debug_dir);

	if (ret) {

		config_item_put(&reg->hr_item);

		goto unregister_handler;

	}

	o2hb_debug_region_init(reg, o2hb_debug_dir);



	return &reg->hr_item;

fs/ocfs2/dlm/dlmcommon.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ struct dlm_ctxt 
	atomic_t res_tot_count;

	atomic_t res_cur_count;



	struct dlm_debug_ctxt *dlm_debug_ctxt;

	struct dentry *dlm_debugfs_subroot;



	/* NOTE: Next three are protected by dlm_domain_lock */

fs/ocfs2/dlm/dlmdebug.c

+11 −44
Original line number Diff line number Diff line
@@ -853,67 +853,34 @@ static const struct file_operations debug_state_fops = { 
/* files in subroot */

void dlm_debug_init(struct dlm_ctxt *dlm)

{

	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;



	/* for dumping dlm_ctxt */

	dc->debug_state_dentry = debugfs_create_file(DLM_DEBUGFS_DLM_STATE,

						     S_IFREG|S_IRUSR,

						     dlm->dlm_debugfs_subroot,

						     dlm, &debug_state_fops);

	debugfs_create_file(DLM_DEBUGFS_DLM_STATE, S_IFREG|S_IRUSR,

			    dlm->dlm_debugfs_subroot, dlm, &debug_state_fops);



	/* for dumping lockres */

	dc->debug_lockres_dentry =

			debugfs_create_file(DLM_DEBUGFS_LOCKING_STATE,

					    S_IFREG|S_IRUSR,

					    dlm->dlm_debugfs_subroot,

					    dlm, &debug_lockres_fops);

	debugfs_create_file(DLM_DEBUGFS_LOCKING_STATE, S_IFREG|S_IRUSR,

			    dlm->dlm_debugfs_subroot, dlm, &debug_lockres_fops);



	/* for dumping mles */

	dc->debug_mle_dentry = debugfs_create_file(DLM_DEBUGFS_MLE_STATE,

						   S_IFREG|S_IRUSR,

						   dlm->dlm_debugfs_subroot,

						   dlm, &debug_mle_fops);

	debugfs_create_file(DLM_DEBUGFS_MLE_STATE, S_IFREG|S_IRUSR,

			    dlm->dlm_debugfs_subroot, dlm, &debug_mle_fops);



	/* for dumping lockres on the purge list */

	dc->debug_purgelist_dentry =

			debugfs_create_file(DLM_DEBUGFS_PURGE_LIST,

					    S_IFREG|S_IRUSR,

					    dlm->dlm_debugfs_subroot,

					    dlm, &debug_purgelist_fops);

}



void dlm_debug_shutdown(struct dlm_ctxt *dlm)

{

	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;



	if (dc) {

		debugfs_remove(dc->debug_purgelist_dentry);

		debugfs_remove(dc->debug_mle_dentry);

		debugfs_remove(dc->debug_lockres_dentry);

		debugfs_remove(dc->debug_state_dentry);

		kfree(dc);

		dc = NULL;

	}

	debugfs_create_file(DLM_DEBUGFS_PURGE_LIST, S_IFREG|S_IRUSR,

			    dlm->dlm_debugfs_subroot, dlm,

			    &debug_purgelist_fops);

}



/* subroot - domain dir */

int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

void dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

{

	dlm->dlm_debug_ctxt = kzalloc(sizeof(struct dlm_debug_ctxt),

				      GFP_KERNEL);

	if (!dlm->dlm_debug_ctxt) {

		mlog_errno(-ENOMEM);

		return -ENOMEM;

	}



	dlm->dlm_debugfs_subroot = debugfs_create_dir(dlm->name,

						      dlm_debugfs_root);

	return 0;

}



void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)

{

	debugfs_remove(dlm->dlm_debugfs_subroot);

	debugfs_remove_recursive(dlm->dlm_debugfs_subroot);

}



/* debugfs root */

fs/ocfs2/dlm/dlmdebug.h

+2 −14
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ void dlm_print_one_mle(struct dlm_master_list_entry *mle); 


#ifdef CONFIG_DEBUG_FS



struct dlm_debug_ctxt {

	struct dentry *debug_state_dentry;

	struct dentry *debug_lockres_dentry;

	struct dentry *debug_mle_dentry;

	struct dentry *debug_purgelist_dentry;

};



struct debug_lockres {

	int dl_len;

	char *dl_buf;
@@ -29,9 +22,8 @@ struct debug_lockres { 
};



void dlm_debug_init(struct dlm_ctxt *dlm);

void dlm_debug_shutdown(struct dlm_ctxt *dlm);



int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm);

void dlm_create_debugfs_subroot(struct dlm_ctxt *dlm);

void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm);



void dlm_create_debugfs_root(void);
@@ -42,12 +34,8 @@ void dlm_destroy_debugfs_root(void); 
static inline void dlm_debug_init(struct dlm_ctxt *dlm)

{

}

static inline void dlm_debug_shutdown(struct dlm_ctxt *dlm)

{

}

static inline int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

static inline void dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

{

	return 0;

}

static inline void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE