There are some mirror changes in kobject_uevent.c.
Btw, this is v5 for the patchset.2/2 was fixed by v1-v4,but 1/2 was marked
V2 :(.
Bo YU (2):
kobject: to repalce printk with pr_* style
kobject: drop newline from msg string
lib/kobject_uevent.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--
2.11.0
Repalce printk with pr_warn in kobject_synth_uevent and replace
printk with pr_err in uevent_net_init to make both consistent with
other code in kobject_uevent.c
Signed-off-by: Bo YU <[email protected]>
---
Changes in V2:
Improve the commit log, doing as the patch did.
---
lib/kobject_uevent.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 27c6118afd1c..c87a96c4800e 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);
@@ -765,8 +765,7 @@ static int uevent_net_init(struct net *net)
ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
if (!ue_sk->sk) {
- printk(KERN_ERR
- "kobject_uevent: unable to create netlink socket!\n");
+ pr_err("kobject_uevent: unable to create netlink socket!\n");
kfree(ue_sk);
return -ENODEV;
}
--
2.11.0
There is currently a missing terminating newline in non-switch case
match when msg == NULL
Signed-off-by: Bo YU <[email protected]>
---
Changes in V4:
Recovery originly declaration, requested by Greg.
Change in V3:
Improve the commit log, requested by Rafael.
Changes in V2:
Drop newline from msg according to Joe's suggestion.
---
lib/kobject_uevent.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index c87a96c4800e..f05802687ba4 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -200,7 +200,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
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;
}
@@ -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);
- pr_warn("synth uevent: %s: %s",
+ pr_warn("synth uevent: %s: %s\n",
devpath ?: "unknown device",
msg ?: "failed to send uevent");
kfree(devpath);
--
2.11.0
On Wed, Jan 9, 2019 at 10:17 AM Bo YU <[email protected]> wrote:
>
> There is currently a missing terminating newline in non-switch case
> match when msg == NULL
>
> Signed-off-by: Bo YU <[email protected]>
I have given you an R-by for this one already, so why haven't you added it here?
Reviewed-by: Rafael J. Wysocki <[email protected]>
> ---
> Changes in V4:
> Recovery originly declaration, requested by Greg.
>
> Change in V3:
> Improve the commit log, requested by Rafael.
>
> Changes in V2:
> Drop newline from msg according to Joe's suggestion.
> ---
> lib/kobject_uevent.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index c87a96c4800e..f05802687ba4 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -200,7 +200,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
>
> 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;
> }
>
> @@ -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);
> - pr_warn("synth uevent: %s: %s",
> + pr_warn("synth uevent: %s: %s\n",
> devpath ?: "unknown device",
> msg ?: "failed to send uevent");
> kfree(devpath);
> --
> 2.11.0
>
On Wed, Jan 09, 2019 at 10:21:37AM +0100, Rafael J. Wysocki wrote:
>On Wed, Jan 9, 2019 at 10:17 AM Bo YU <[email protected]> wrote:
>>
>> There is currently a missing terminating newline in non-switch case
>> match when msg == NULL
>>
>> Signed-off-by: Bo YU <[email protected]>
>
>I have given you an R-by for this one already, so why haven't you added it here?
Oh, i got it.This is the first time i encountered the circumstances.
>
>Reviewed-by: Rafael J. Wysocki <[email protected]>
Thank you :)
>
>> ---
>> Changes in V4:
>> Recovery originly declaration, requested by Greg.
>>
>> Change in V3:
>> Improve the commit log, requested by Rafael.
>>
>> Changes in V2:
>> Drop newline from msg according to Joe's suggestion.
>> ---
>> lib/kobject_uevent.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> index c87a96c4800e..f05802687ba4 100644
>> --- a/lib/kobject_uevent.c
>> +++ b/lib/kobject_uevent.c
>> @@ -200,7 +200,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
>>
>> 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;
>> }
>>
>> @@ -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);
>> - pr_warn("synth uevent: %s: %s",
>> + pr_warn("synth uevent: %s: %s\n",
>> devpath ?: "unknown device",
>> msg ?: "failed to send uevent");
>> kfree(devpath);
>> --
>> 2.11.0
>>
On Wed, Jan 9, 2019 at 10:17 AM Bo YU <[email protected]> wrote:
>
> Repalce printk with pr_warn in kobject_synth_uevent and replace
> printk with pr_err in uevent_net_init to make both consistent with
> other code in kobject_uevent.c
>
> Signed-off-by: Bo YU <[email protected]>
Reviewed-by: Rafael J. Wysocki <[email protected]>
>
> ---
> Changes in V2:
> Improve the commit log, doing as the patch did.
> ---
> lib/kobject_uevent.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index 27c6118afd1c..c87a96c4800e 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);
> @@ -765,8 +765,7 @@ static int uevent_net_init(struct net *net)
>
> ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
> if (!ue_sk->sk) {
> - printk(KERN_ERR
> - "kobject_uevent: unable to create netlink socket!\n");
> + pr_err("kobject_uevent: unable to create netlink socket!\n");
> kfree(ue_sk);
> return -ENODEV;
> }
> --
> 2.11.0
>