diff options
author | Kinglong Mee <kinglongmee@gmail.com> | 2014-05-29 00:18:52 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-05-30 20:25:28 -0400 |
commit | a48fd0f9f77b6e144813230c26621c00aac92ce8 (patch) | |
tree | 6e65a80c2623708c595a212fbb4e82d471e7042f | |
parent | b52bd7bccca57b2bbe837d14a0bf3e45279459a8 (diff) |
SUNRPC/NFSD: Remove using of dprintk with KERN_WARNING
When debugging, rpc prints messages from dprintk(KERN_WARNING ...)
with "^A4" prefixed,
[ 2780.339988] ^A4nfsd: connect from unprivileged port: 127.0.0.1, port=35316
Trond tells,
> dprintk != printk. We have NEVER supported dprintk(KERN_WARNING...)
This patch removes using of dprintk with KERN_WARNING.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r-- | fs/nfsd/nfsfh.c | 5 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index a337106d6875..ec8393418154 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
@@ -88,9 +88,8 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp, | |||
88 | /* Check if the request originated from a secure port. */ | 88 | /* Check if the request originated from a secure port. */ |
89 | if (!rqstp->rq_secure && !(flags & NFSEXP_INSECURE_PORT)) { | 89 | if (!rqstp->rq_secure && !(flags & NFSEXP_INSECURE_PORT)) { |
90 | RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]); | 90 | RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]); |
91 | dprintk(KERN_WARNING | 91 | dprintk("nfsd: request from insecure port %s!\n", |
92 | "nfsd: request from insecure port %s!\n", | 92 | svc_print_addr(rqstp, buf, sizeof(buf))); |
93 | svc_print_addr(rqstp, buf, sizeof(buf))); | ||
94 | return nfserr_perm; | 93 | return nfserr_perm; |
95 | } | 94 | } |
96 | 95 | ||
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index f3b8eb309d01..b507cd327d9b 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -849,8 +849,7 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) | |||
849 | * tell us anything. For now just warn about unpriv connections. | 849 | * tell us anything. For now just warn about unpriv connections. |
850 | */ | 850 | */ |
851 | if (!svc_port_is_privileged(sin)) { | 851 | if (!svc_port_is_privileged(sin)) { |
852 | dprintk(KERN_WARNING | 852 | dprintk("%s: connect from unprivileged port: %s\n", |
853 | "%s: connect from unprivileged port: %s\n", | ||
854 | serv->sv_name, | 853 | serv->sv_name, |
855 | __svc_print_addr(sin, buf, sizeof(buf))); | 854 | __svc_print_addr(sin, buf, sizeof(buf))); |
856 | } | 855 | } |