diff options
Diffstat (limited to 'net/9p/mod.c')
| -rw-r--r-- | net/9p/mod.c | 39 | 
1 files changed, 33 insertions, 6 deletions
diff --git a/net/9p/mod.c b/net/9p/mod.c index cf8a4128cd5..6ab36aea772 100644 --- a/net/9p/mod.c +++ b/net/9p/mod.c @@ -24,7 +24,11 @@   *   */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +  #include <linux/module.h> +#include <linux/errno.h> +#include <linux/sched.h>  #include <linux/moduleparam.h>  #include <net/9p/9p.h>  #include <linux/fs.h> @@ -39,6 +43,29 @@ unsigned int p9_debug_level = 0;	/* feature-rific global debug level  */  EXPORT_SYMBOL(p9_debug_level);  module_param_named(debug, p9_debug_level, uint, 0);  MODULE_PARM_DESC(debug, "9P debugging level"); + +void _p9_debug(enum p9_debug_flags level, const char *func, +		const char *fmt, ...) +{ +	struct va_format vaf; +	va_list args; + +	if ((p9_debug_level & level) != level) +		return; + +	va_start(args, fmt); + +	vaf.fmt = fmt; +	vaf.va = &args; + +	if (level == P9_DEBUG_9P) +		pr_notice("(%8.8d) %pV", task_pid_nr(current), &vaf); +	else +		pr_notice("-- %s (%d): %pV", func, task_pid_nr(current), &vaf); + +	va_end(args); +} +EXPORT_SYMBOL(_p9_debug);  #endif  /* @@ -80,14 +107,14 @@ EXPORT_SYMBOL(v9fs_unregister_trans);   * @name: string identifying transport   *   */ -struct p9_trans_module *v9fs_get_trans_by_name(const substring_t *name) +struct p9_trans_module *v9fs_get_trans_by_name(char *s)  {  	struct p9_trans_module *t, *found = NULL;  	spin_lock(&v9fs_trans_lock);  	list_for_each_entry(t, &v9fs_trans_list, list) -		if (strncmp(t->name, name->from, name->to-name->from) == 0 && +		if (strcmp(t->name, s) == 0 &&  		    try_module_get(t->owner)) {  			found = t;  			break; @@ -139,7 +166,7 @@ void v9fs_put_trans(struct p9_trans_module *m)  }  /** - * v9fs_init - Initialize module + * init_p9 - Initialize module   *   */  static int __init init_p9(void) @@ -147,20 +174,20 @@ static int __init init_p9(void)  	int ret = 0;  	p9_error_init(); -	printk(KERN_INFO "Installing 9P2000 support\n"); +	pr_info("Installing 9P2000 support\n");  	p9_trans_fd_init();  	return ret;  }  /** - * v9fs_init - shutdown module + * exit_p9 - shutdown module   *   */  static void __exit exit_p9(void)  { -	printk(KERN_INFO "Unloading 9P2000 support\n"); +	pr_info("Unloading 9P2000 support\n");  	p9_trans_fd_exit();  }  | 
