From: Ian Kent <raven@themaw.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
autofs mailing list <autofs@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 04/13] autofs4 - change printks AUTOFS defined prints
Date: Mon, 03 Nov 2014 16:12:34 +0800 [thread overview]
Message-ID: <20141103081234.6215.82821.stgit@perseus.themaw.net> (raw)
In-Reply-To: <20141103081218.6215.85903.stgit@perseus.themaw.net>
Use the AUTOFS_*() print defines instead of raw printks.
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs4/inode.c | 13 +++++++------
fs/autofs4/waitq.c | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 80389af..7849591 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -266,14 +266,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)) {
- printk("autofs: called with bogus options\n");
+ AUTOFS_ERROR("autofs: called with bogus options");
goto fail_dput;
}
if (pgrp_set) {
sbi->oz_pgrp = find_get_pid(pgrp);
if (!sbi->oz_pgrp) {
- pr_warn("autofs: could not find process group %d\n",
+ AUTOFS_ERROR("autofs: could not find process group %d",
pgrp);
goto fail_dput;
}
@@ -290,8 +290,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
/* Couldn't this be tested earlier? */
if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||
sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {
- printk("autofs: kernel does not match daemon version "
- "daemon (%d, %d) kernel (%d, %d)\n",
+ AUTOFS_ERROR("autofs: kernel does not match daemon version "
+ "daemon (%d, %d) kernel (%d, %d)",
sbi->min_proto, sbi->max_proto,
AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);
goto fail_dput;
@@ -308,7 +308,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
pipe = fget(pipefd);
if (!pipe) {
- printk("autofs: could not open pipe file descriptor\n");
+ AUTOFS_ERROR("autofs: could not open pipe file descriptor");
goto fail_dput;
}
ret = autofs_prepare_pipe(pipe);
@@ -328,7 +328,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
* Failure ... clean up.
*/
fail_fput:
- printk("autofs: pipe file descriptor does not contain proper ops\n");
+ AUTOFS_ERROR(
+ "autofs: pipe file descriptor does not contain proper ops");
fput(pipe);
/* fall through */
fail_dput:
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index b7f2deb..3a28d29 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -162,7 +162,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
break;
}
default:
- printk("autofs4_notify_daemon: bad type %d!\n", type);
+ AUTOFS_WARN("autofs4_notify_daemon: bad type %d!", type);
mutex_unlock(&sbi->wq_mutex);
return;
}
next prev parent reply other threads:[~2014-11-03 8:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 8:12 [PATCH 01/13] autofs4 - coding style fixes Ian Kent
2014-11-03 8:12 ` [PATCH 02/13] autofs4 - fix some white space errors Ian Kent
2014-11-03 8:12 ` [PATCH 03/13] autofs4 - use pr print in AUTOFS prints Ian Kent
2014-11-03 8:12 ` Ian Kent [this message]
2014-11-03 8:25 ` [PATCH 04/13] autofs4 - change printks AUTOFS defined prints Joe Perches
2014-11-03 9:20 ` Ian Kent
2014-11-03 14:33 ` Joe Perches
2014-11-05 23:02 ` Ian Kent
2014-11-05 23:20 ` Joe Perches
2014-11-05 23:42 ` Ian Kent
2014-11-03 8:12 ` [PATCH 05/13] autofs4 - fix string.h include in auto_dev-ioctl.h Ian Kent
2014-11-03 8:12 ` [PATCH 06/13] autofs4 - move linux/auto_dev-ioctl.h to uapi/linux Ian Kent
2014-11-03 8:12 ` [PATCH 07/13] autofs - merge auto_fs.h and auto_fs4.h Ian Kent
2014-11-03 8:12 ` [PATCH 08/13] autofs - use autofs instead of autofs4 everywhere Ian Kent
2014-11-03 8:13 ` [PATCH 09/13] autofs - copy autofs4 to autofs Ian Kent
2014-11-03 8:13 ` [PATCH 10/13] autofs - create autofs Kconfig and Makefile Ian Kent
2014-11-03 8:13 ` [PATCH 11/13] autofs - update fs/autofs4/Kconfig Ian Kent
2014-11-03 8:13 ` [PATCH 12/13] autofs - update fs/autofs4/Makefile Ian Kent
2014-11-03 8:13 ` [PATCH 13/13] autofs - delete fs/autofs4 source files Ian Kent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141103081234.6215.82821.stgit@perseus.themaw.net \
--to=raven@themaw.net \
--cc=akpm@linux-foundation.org \
--cc=autofs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).