[Devel] files: remove extra newline from a message create_ghost_dentry

Submitted by Stanislav Kinsburskiy on June 8, 2017, 2 p.m.

Details

Message ID 20170608140004.6683.48124.stgit@skinsbursky-vz7.qa.sw.ru
State New
Series "files: remove extra newline from a message create_ghost_dentry"
Headers show

Commit Message

Stanislav Kinsburskiy June 8, 2017, 2 p.m.
Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
---
 criu/files-reg.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/files-reg.c b/criu/files-reg.c
index bcfe1fd..f749445 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -219,7 +219,7 @@  again:
 			msg = "Can't create node for ghost file";
 	} else if (S_ISCHR(gfe->mode) || S_ISBLK(gfe->mode)) {
 		if (!gfe->has_rdev) {
-			pr_err("No rdev for ghost device\n");
+			pr_err("No rdev for ghost device");
 			goto err;
 		}
 		if ((ret = mknod(path, gfe->mode, gfe->rdev)) < 0)
@@ -229,7 +229,7 @@  again:
 			msg = "Can't make ghost dir";
 	} else {
 		if ((ret = mkreg_ghost(path, gfe->mode, img)) < 0)
-			msg = "Can't create ghost regfile\n";
+			msg = "Can't create ghost regfile";
 	}
 
 	if (ret < 0) {

Comments

Dmitry Safonov June 8, 2017, 2:33 p.m.
On 06/08/2017 05:00 PM, Stanislav Kinsburskiy wrote:
> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
> ---
>   criu/files-reg.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/criu/files-reg.c b/criu/files-reg.c
> index bcfe1fd..f749445 100644
> --- a/criu/files-reg.c
> +++ b/criu/files-reg.c
> @@ -219,7 +219,7 @@ again:
>   			msg = "Can't create node for ghost file";
>   	} else if (S_ISCHR(gfe->mode) || S_ISBLK(gfe->mode)) {
>   		if (!gfe->has_rdev) {
> -			pr_err("No rdev for ghost device\n");
> +			pr_err("No rdev for ghost device");

But pr_err() doesn't insert a newline.

>   			goto err;
>   		}
>   		if ((ret = mknod(path, gfe->mode, gfe->rdev)) < 0)
> @@ -229,7 +229,7 @@ again:
>   			msg = "Can't make ghost dir";
>   	} else {
>   		if ((ret = mkreg_ghost(path, gfe->mode, img)) < 0)
> -			msg = "Can't create ghost regfile\n";
> +			msg = "Can't create ghost regfile";
>   	}
>   
>   	if (ret < 0) {
>
Stanislav Kinsburskiy June 8, 2017, 2:35 p.m.
08.06.2017 16:33, Dmitry Safonov пишет:
> On 06/08/2017 05:00 PM, Stanislav Kinsburskiy wrote:
>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
>> ---
>>   criu/files-reg.c |    4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/criu/files-reg.c b/criu/files-reg.c
>> index bcfe1fd..f749445 100644
>> --- a/criu/files-reg.c
>> +++ b/criu/files-reg.c
>> @@ -219,7 +219,7 @@ again:
>>               msg = "Can't create node for ghost file";
>>       } else if (S_ISCHR(gfe->mode) || S_ISBLK(gfe->mode)) {
>>           if (!gfe->has_rdev) {
>> -            pr_err("No rdev for ghost device\n");
>> +            pr_err("No rdev for ghost device");
>
> But pr_err() doesn't insert a newline.

Right.
Then it's better to take commit bee9cc8a instead this patch.
Dmitry Safonov June 8, 2017, 2:36 p.m.
On 06/08/2017 05:35 PM, Stanislav Kinsburskiy wrote:
> 08.06.2017 16:33, Dmitry Safonov пишет:
>> On 06/08/2017 05:00 PM, Stanislav Kinsburskiy wrote:
>>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
>>> ---
>>>   criu/files-reg.c |    4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/criu/files-reg.c b/criu/files-reg.c
>>> index bcfe1fd..f749445 100644
>>> --- a/criu/files-reg.c
>>> +++ b/criu/files-reg.c
>>> @@ -219,7 +219,7 @@ again:
>>>               msg = "Can't create node for ghost file";
>>>       } else if (S_ISCHR(gfe->mode) || S_ISBLK(gfe->mode)) {
>>>           if (!gfe->has_rdev) {
>>> -            pr_err("No rdev for ghost device\n");
>>> +            pr_err("No rdev for ghost device");
>>
>> But pr_err() doesn't insert a newline.
> 
> Right.
> Then it's better to take commit bee9cc8a instead this patch.

Ok.