2018-12-07 10:22:04

by Bo YU

Subject: [PATCH v3 0/2] kobject: trival fix

This is trival fix for lib/kobject_uevent.c file.

Bo YU (2):
kobject: use pr_warn to replace printk
kobject: drop newline from msg string

lib/kobject_uevent.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

--
2.11.0

2018-12-07 10:22:38

by Bo YU

Subject: [PATCH v3 1/2] kobject: use pr_warn to replace printk

This is a fix to replace printk with pr_warn

Signed-off-by: Bo YU <[email protected]>
---
lib/kobject_uevent.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 63d0816ab23b..b7c088c902a2 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
out:
if (r) {
devpath = kobject_get_path(kobj, GFP_KERNEL);
- printk(KERN_WARNING "synth uevent: %s: %s",
+ pr_warn("synth uevent: %s: %s",
devpath ?: "unknown device",
msg ?: "failed to send uevent");
kfree(devpath);
--
2.11.0

2018-12-07 10:23:21

by Bo YU

Subject: [PATCH v3 2/2] kobject: drop newline from msg string

There is currently a missing terminating newline in non-switch case
match, when msg == NULL.

Signed-off-by: Bo YU <[email protected]>
---
Changes in v3:
Improve the commit log,requested by rafael.

Changes in v2:
According to Joe's suggestion,drop newline from msg

lib/kobject_uevent.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index b7c088c902a2..1837765ebf01 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
enum kobject_action action;
const char *action_args;
struct kobj_uevent_env *env;
- const char *msg = NULL, *devpath;
+ const char *msg = NULL;
int r;

r = kobject_action_type(buf, count, &action, &action_args);
if (r) {
- msg = "unknown uevent action string\n";
+ msg = "unknown uevent action string";
goto out;
}

@@ -212,7 +212,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
r = kobject_action_args(action_args,
count - (action_args - buf), &env);
if (r == -EINVAL) {
- msg = "incorrect uevent action arguments\n";
+ msg = "incorrect uevent action arguments";
goto out;
}

@@ -223,8 +223,9 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
kfree(env);
out:
if (r) {
- devpath = kobject_get_path(kobj, GFP_KERNEL);
- pr_warn("synth uevent: %s: %s",
+ char *devpath = kobject_get_path(kobj, GFP_KERNEL);
+
+ pr_warn("synth uevent: %s: %s\n",
devpath ?: "unknown device",
msg ?: "failed to send uevent");
kfree(devpath);
--
2.11.0

2018-12-07 12:06:55

by Greg Kroah-Hartman

Subject: Re: [PATCH v3 2/2] kobject: drop newline from msg string

On Fri, Dec 07, 2018 at 05:21:49AM -0500, Bo YU wrote:
> There is currently a missing terminating newline in non-switch case
> match, when msg == NULL.
>
> Signed-off-by: Bo YU <[email protected]>
> ---
> Changes in v3:
> Improve the commit log,requested by rafael.
>
> Changes in v2:
> According to Joe's suggestion,drop newline from msg
>
> lib/kobject_uevent.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index b7c088c902a2..1837765ebf01 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
> enum kobject_action action;
> const char *action_args;
> struct kobj_uevent_env *env;
> - const char *msg = NULL, *devpath;
> + const char *msg = NULL;

Why did you move the devpath variable from here to lower down? That
really doesn't do anything :(

thanks,

greg k-h

2018-12-07 14:45:19

by Bo YU

Subject: Re: [PATCH v3 2/2] kobject: drop newline from msg string

On Fri, Dec 07, 2018 at 01:04:05PM +0100, Greg KH wrote:
>On Fri, Dec 07, 2018 at 05:21:49AM -0500, Bo YU wrote:
>> There is currently a missing terminating newline in non-switch case
>> match, when msg == NULL.
>>
>> Signed-off-by: Bo YU <[email protected]>
>> ---
>> Changes in v3:
>> Improve the commit log,requested by rafael.
>>
>> Changes in v2:
>> According to Joe's suggestion,drop newline from msg
>>
>> lib/kobject_uevent.c | 11 ++++++-----
>> 1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> index b7c088c902a2..1837765ebf01 100644
>> --- a/lib/kobject_uevent.c
>> +++ b/lib/kobject_uevent.c
>> @@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
>> enum kobject_action action;
>> const char *action_args;
>> struct kobj_uevent_env *env;
>> - const char *msg = NULL, *devpath;
>> + const char *msg = NULL;
>
>Why did you move the devpath variable from here to lower down? That
>really doesn't do anything :(
Hm...If i resend the one patch will be ok?
Or whole series?
>
>thanks,
>
>greg k-h