Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

orangefs: fix build warning from debugfs cleanup patch

Browse Source 
Stephen writes:
	After merging the driver-core tree, today's linux-next build (x86_64
	allmodconfig) produced this warning:

	fs/orangefs/orangefs-debugfs.c: In function 'orangefs_debugfs_init':
	fs/orangefs/orangefs-debugfs.c:193:1: warning: label 'out' defined but not used [-Wunused-label]
	 out:
	 ^~~
	fs/orangefs/orangefs-debugfs.c: In function 'orangefs_kernel_debug_init':
	fs/orangefs/orangefs-debugfs.c:204:17: warning: unused variable 'ret' [-Wunused-variable]
	  struct dentry *ret;
	                 ^~~
Fix this up and change the return type of the function to void as it can
not fail, which cleans up some more code and variables as well.

Cc: Mike Marshall <hubcap@omnibond.com>
Cc: Martin Brandenburg <martin@omnibond.com>
Cc: devel@lists.orangefs.org
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: f095adba36 ("orangefs: no need to check return value of debugfs_create functions")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2019-07-04 10:28:36 +02:00
parent d71cac5971
commit 0979cf95d2
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/orangefs/orangefs-debugfs.c
View File

@ -64,7 +64,7 @@ struct client_debug_mask {
__u64 mask2; __u64 mask2;
}; };
static int orangefs_kernel_debug_init(void); static void orangefs_kernel_debug_init(void);
static int orangefs_debug_help_open(struct inode *, struct file *); static int orangefs_debug_help_open(struct inode *, struct file *);
static void *help_start(struct seq_file *, loff_t *); static void *help_start(struct seq_file *, loff_t *);
@ -150,10 +150,8 @@ static DEFINE_MUTEX(orangefs_help_file_lock);
* initialize kmod debug operations, create orangefs debugfs dir and * initialize kmod debug operations, create orangefs debugfs dir and
* ORANGEFS_KMOD_DEBUG_HELP_FILE. * ORANGEFS_KMOD_DEBUG_HELP_FILE.
*/ */
int orangefs_debugfs_init(int debug_mask) void orangefs_debugfs_init(int debug_mask)
{ {
int rc = -ENOMEM;
/* convert input debug mask to a 64-bit unsigned integer */ /* convert input debug mask to a 64-bit unsigned integer */
orangefs_gossip_debug_mask = (unsigned long long)debug_mask; orangefs_gossip_debug_mask = (unsigned long long)debug_mask;
@ -188,20 +186,15 @@ int orangefs_debugfs_init(int debug_mask)
orangefs_debug_disabled = 0; orangefs_debug_disabled = 0;
rc = orangefs_kernel_debug_init(); orangefs_kernel_debug_init();
out:
return rc;
} }
/* /*
* initialize the kernel-debug file. * initialize the kernel-debug file.
*/ */
static int orangefs_kernel_debug_init(void) static void orangefs_kernel_debug_init(void)
{ {
int rc = -ENOMEM; int rc = -ENOMEM;
struct dentry *ret;
char *k_buffer = NULL; char *k_buffer = NULL;
gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__); gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__);
@ -221,12 +214,8 @@ static int orangefs_kernel_debug_init(void)
debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer, debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer,
&kernel_debug_fops); &kernel_debug_fops);
rc = 0;
out: out:
gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: rc:%d:\n", __func__, rc); gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: rc:%d:\n", __func__, rc);
return rc;
} }

2
fs/orangefs/orangefs-debugfs.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
int orangefs_debugfs_init(int); void orangefs_debugfs_init(int);
void orangefs_debugfs_cleanup(void); void orangefs_debugfs_cleanup(void);
int orangefs_prepare_debugfs_help_string(int); int orangefs_prepare_debugfs_help_string(int);
int orangefs_debugfs_new_client_mask(void __user *); int orangefs_debugfs_new_client_mask(void __user *);

6
fs/orangefs/orangefs-mod.c
View File

@ -129,9 +129,7 @@ static int __init orangefs_init(void)
if (ret) if (ret)
goto cleanup_key_table; goto cleanup_key_table;
ret = orangefs_debugfs_init(module_parm_debug_mask); orangefs_debugfs_init(module_parm_debug_mask);
if (ret)
goto debugfs_init_failed;
ret = orangefs_sysfs_init(); ret = orangefs_sysfs_init();
if (ret) if (ret)
@ -161,8 +159,6 @@ cleanup_device:
orangefs_dev_cleanup(); orangefs_dev_cleanup();
sysfs_init_failed: sysfs_init_failed:
debugfs_init_failed:
orangefs_debugfs_cleanup(); orangefs_debugfs_cleanup();
cleanup_key_table: cleanup_key_table: