Re: [PATCH v2] fix printk output

[Rusty Russell]

Sergei Ianovich <ynvich@xxxxxxxxx> writes:
> Signed-off-by: Sergei Ianovich <ynvich@xxxxxxxxx>
> CC: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
> ---
>  Changes v1..v2
>  * 1-for-1 match between source and output lines
>  * clarify warning
>  * print tool name to avoid confusion with what to upgrade

Hmm, the copy here is gratuitous.  Using current->comm is safe, just
possibly ambigious if someone is changing the task name at the same time.

And we really want this one line anyway:

  		printk(KERN_WARNING
 		       "%s: waiting module removal not supported: please upgrade\n",
                        current->comm);

BTW, did you actually hit this?

Thanks,
Rusty.

>  kernel/module.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index f5a3b1e..0e627e7 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -816,8 +816,10 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
>  	name[MODULE_NAME_LEN-1] = '\0';
>  
>  	if (!(flags & O_NONBLOCK)) {
> +		char tool[TASK_COMM_LEN];
>  		printk(KERN_WARNING
> -		       "waiting module removal not supported: please upgrade");
> +		       "waiting module removal no longer supported\n"
> +		       "please upgrade %s\n", get_task_comm(tool, current));
>  	}
>  
>  	if (mutex_lock_interruptible(&module_mutex) != 0)
> -- 
> 1.8.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/