autofs4: change log print macros to not insert newline
Common kernel coding practice is to include the newline of log prints within the log text rather than hidden away in a macro. To avoid introducing inconsistencies as changes are made change the log macros to not include the newline. Signed-off-by: Ian Kent <raven@themaw.net> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -60,7 +60,7 @@ void autofs4_kill_sb(struct super_block *sb)
|
||||
put_pid(sbi->oz_pgrp);
|
||||
}
|
||||
|
||||
DPRINTK("shutting down");
|
||||
DPRINTK("shutting down\n");
|
||||
kill_litter_super(sb);
|
||||
if (sbi)
|
||||
kfree_rcu(sbi, rcu);
|
||||
@@ -221,7 +221,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
|
||||
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
|
||||
if (!sbi)
|
||||
return -ENOMEM;
|
||||
DPRINTK("starting up, sbi = %p", sbi);
|
||||
DPRINTK("starting up, sbi = %p\n", sbi);
|
||||
|
||||
s->s_fs_info = sbi;
|
||||
sbi->magic = AUTOFS_SBI_MAGIC;
|
||||
@@ -270,14 +270,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
|
||||
if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid,
|
||||
&pgrp, &pgrp_set, &sbi->type, &sbi->min_proto,
|
||||
&sbi->max_proto)) {
|
||||
AUTOFS_ERROR("called with bogus options");
|
||||
AUTOFS_ERROR("called with bogus options\n");
|
||||
goto fail_dput;
|
||||
}
|
||||
|
||||
if (pgrp_set) {
|
||||
sbi->oz_pgrp = find_get_pid(pgrp);
|
||||
if (!sbi->oz_pgrp) {
|
||||
AUTOFS_ERROR("could not find process group %d",
|
||||
AUTOFS_ERROR("could not find process group %d\n",
|
||||
pgrp);
|
||||
goto fail_dput;
|
||||
}
|
||||
@@ -295,7 +295,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
|
||||
if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||
|
||||
sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {
|
||||
AUTOFS_ERROR("kernel does not match daemon version "
|
||||
"daemon (%d, %d) kernel (%d, %d)",
|
||||
"daemon (%d, %d) kernel (%d, %d)\n",
|
||||
sbi->min_proto, sbi->max_proto,
|
||||
AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);
|
||||
goto fail_dput;
|
||||
@@ -308,11 +308,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
|
||||
sbi->version = sbi->max_proto;
|
||||
sbi->sub_version = AUTOFS_PROTO_SUBVERSION;
|
||||
|
||||
DPRINTK("pipe fd = %d, pgrp = %u", pipefd, pid_nr(sbi->oz_pgrp));
|
||||
DPRINTK("pipe fd = %d, pgrp = %u\n", pipefd, pid_nr(sbi->oz_pgrp));
|
||||
pipe = fget(pipefd);
|
||||
|
||||
if (!pipe) {
|
||||
AUTOFS_ERROR("could not open pipe file descriptor");
|
||||
AUTOFS_ERROR("could not open pipe file descriptor\n");
|
||||
goto fail_dput;
|
||||
}
|
||||
ret = autofs_prepare_pipe(pipe);
|
||||
@@ -332,7 +332,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
|
||||
* Failure ... clean up.
|
||||
*/
|
||||
fail_fput:
|
||||
AUTOFS_ERROR("pipe file descriptor does not contain proper ops");
|
||||
AUTOFS_ERROR("pipe file descriptor does not contain proper ops\n");
|
||||
fput(pipe);
|
||||
/* fall through */
|
||||
fail_dput:
|
||||
|
Reference in New Issue
Block a user