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

Commit a48f9721 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David Teigland
Browse files

dlm: no need to check return value of debugfs_create functions 



When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent b355516f

fs/dlm/debug_fs.c

+2 −19
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls) 
	debugfs_remove(ls->ls_debug_toss_dentry);

}



int dlm_create_debug_file(struct dlm_ls *ls)

void dlm_create_debug_file(struct dlm_ls *ls)

{

	char name[DLM_LOCKSPACE_LEN + 8];
@@ -748,8 +748,6 @@ int dlm_create_debug_file(struct dlm_ls *ls) 
						      dlm_root,

						      ls,

						      &format1_fops);

	if (!ls->ls_debug_rsb_dentry)

		goto fail;



	/* format 2 */
@@ -761,8 +759,6 @@ int dlm_create_debug_file(struct dlm_ls *ls) 
							dlm_root,

							ls,

							&format2_fops);

	if (!ls->ls_debug_locks_dentry)

		goto fail;



	/* format 3 */
@@ -774,8 +770,6 @@ int dlm_create_debug_file(struct dlm_ls *ls) 
						      dlm_root,

						      ls,

						      &format3_fops);

	if (!ls->ls_debug_all_dentry)

		goto fail;



	/* format 4 */
@@ -787,8 +781,6 @@ int dlm_create_debug_file(struct dlm_ls *ls) 
						       dlm_root,

						       ls,

						       &format4_fops);

	if (!ls->ls_debug_toss_dentry)

		goto fail;



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_waiters", ls->ls_name);
@@ -798,21 +790,12 @@ int dlm_create_debug_file(struct dlm_ls *ls) 
							  dlm_root,

							  ls,

							  &waiters_fops);

	if (!ls->ls_debug_waiters_dentry)

		goto fail;



	return 0;



 fail:

	dlm_delete_debug_file(ls);

	return -ENOMEM;

}



int __init dlm_register_debugfs(void)

void __init dlm_register_debugfs(void)

{

	mutex_init(&debug_buf_lock);

	dlm_root = debugfs_create_dir("dlm", NULL);

	return dlm_root ? 0 : -ENOMEM;

}



void dlm_unregister_debugfs(void)

fs/dlm/dlm_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -719,14 +719,14 @@ int dlm_plock_init(void); 
void dlm_plock_exit(void);



#ifdef CONFIG_DLM_DEBUG

int dlm_register_debugfs(void);

void dlm_register_debugfs(void);

void dlm_unregister_debugfs(void);

int dlm_create_debug_file(struct dlm_ls *ls);

void dlm_create_debug_file(struct dlm_ls *ls);

void dlm_delete_debug_file(struct dlm_ls *ls);

#else

static inline int dlm_register_debugfs(void) { return 0; }

static inline void dlm_register_debugfs(void) { }

static inline void dlm_unregister_debugfs(void) { }

static inline int dlm_create_debug_file(struct dlm_ls *ls) { return 0; }

static inline void dlm_create_debug_file(struct dlm_ls *ls) { }

static inline void dlm_delete_debug_file(struct dlm_ls *ls) { }

#endif

fs/dlm/main.c

+1 −4
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ static int __init init_dlm(void) 
	if (error)

		goto out_lockspace;



	error = dlm_register_debugfs();

	if (error)

		goto out_config;

	dlm_register_debugfs();



	error = dlm_user_init();

	if (error)
@@ -61,7 +59,6 @@ static int __init init_dlm(void) 
	dlm_user_exit();

 out_debug:

	dlm_unregister_debugfs();

 out_config:

	dlm_config_exit();

 out_lockspace:

	dlm_lockspace_exit();