Skip to content

Commit

Permalink
ncpfs: Add pr_fmt and convert printks to pr_<level>
Browse files Browse the repository at this point in the history 
Convert to a more current logging style.

Add pr_fmt to prefix with "ncpfs: ".
Remove the embedded function names and use "%s: ", __func__

Some previously unprefixed messages now have "ncpfs: "

Signed-off-by: Joe Perches <[email protected]>
Cc: Petr Vandrovec <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@JoePerches @torvalds
JoePerches authored and torvalds committed Apr 8, 2014
1 parent d0057ca commit b41f8b8
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 27 deletions.
4 changes: 3 additions & 1 deletion fs/ncpfs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <asm/uaccess.h>

#include <linux/time.h>
Expand Down Expand Up @@ -34,7 +36,7 @@ int ncp_make_open(struct inode *inode, int right)

error = -EINVAL;
if (!inode) {
printk(KERN_ERR "ncp_make_open: got NULL inode\n");
pr_err("%s: got NULL inode\n", __func__);
goto out;
}

Expand Down
12 changes: 7 additions & 5 deletions fs/ncpfs/getopt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* getopt.c
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
#include <linux/string.h>

Expand Down Expand Up @@ -46,8 +48,8 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
if (opts->has_arg & OPT_NOPARAM) {
return opts->val;
}
printk(KERN_INFO "%s: the %s option requires an argument\n",
caller, token);
pr_info("%s: the %s option requires an argument\n",
caller, token);
return -EINVAL;
}
if (opts->has_arg & OPT_INT) {
Expand All @@ -57,18 +59,18 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
if (!*v) {
return opts->val;
}
printk(KERN_INFO "%s: invalid numeric value in %s=%s\n",
pr_info("%s: invalid numeric value in %s=%s\n",
caller, token, val);
return -EDOM;
}
if (opts->has_arg & OPT_STRING) {
return opts->val;
}
printk(KERN_INFO "%s: unexpected argument %s to the %s option\n",
pr_info("%s: unexpected argument %s to the %s option\n",
caller, val, token);
return -EINVAL;
}
}
printk(KERN_INFO "%s: Unrecognized mount option %s\n", caller, token);
pr_info("%s: Unrecognized mount option %s\n", caller, token);
return -EOPNOTSUPP;
}
10 changes: 6 additions & 4 deletions fs/ncpfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>

#include <asm/uaccess.h>
Expand Down Expand Up @@ -258,7 +260,7 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info)
struct inode *inode;

if (info == NULL) {
printk(KERN_ERR "ncp_iget: info is NULL\n");
pr_err("%s: info is NULL\n", __func__);
return NULL;
}

Expand Down Expand Up @@ -290,7 +292,7 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info)
}
insert_inode_hash(inode);
} else
printk(KERN_ERR "ncp_iget: iget failed!\n");
pr_err("%s: iget failed!\n", __func__);
return inode;
}

Expand All @@ -306,7 +308,7 @@ ncp_evict_inode(struct inode *inode)

if (ncp_make_closed(inode) != 0) {
/* We can't do anything but complain. */
printk(KERN_ERR "ncp_evict_inode: could not close\n");
pr_err("%s: could not close\n", __func__);
}
}

Expand Down Expand Up @@ -621,7 +623,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
now because of PATH_MAX changes.. */
if (server->m.time_out < 1) {
server->m.time_out = 10;
printk(KERN_INFO "You need to recompile your ncpfs utils..\n");
pr_info("You need to recompile your ncpfs utils..\n");
}
server->m.time_out = server->m.time_out * HZ / 100;
server->m.file_mode = (server->m.file_mode & S_IRWXUGO) | S_IFREG;
Expand Down
4 changes: 2 additions & 2 deletions fs/ncpfs/ncplib_kernel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include "ncp_fs.h"

Expand Down Expand Up @@ -425,7 +425,7 @@ int ncp_obtain_info(struct ncp_server *server, struct inode *dir, const char *pa
int result;

if (target == NULL) {
printk(KERN_ERR "ncp_obtain_info: invalid call\n");
pr_err("%s: invalid call\n", __func__);
return -EINVAL;
}
ncp_init_request(server);
Expand Down
31 changes: 16 additions & 15 deletions fs/ncpfs/sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/time.h>
#include <linux/errno.h>
Expand Down Expand Up @@ -231,7 +232,7 @@ static void __ncptcp_try_send(struct ncp_server *server)
return;

if (result < 0) {
printk(KERN_ERR "ncpfs: tcp: Send failed: %d\n", result);
pr_err("tcp: Send failed: %d\n", result);
__ncp_abort_request(server, rq, result);
return;
}
Expand Down Expand Up @@ -332,7 +333,7 @@ static int ncp_add_request(struct ncp_server *server, struct ncp_request_reply *
mutex_lock(&server->rcv.creq_mutex);
if (!ncp_conn_valid(server)) {
mutex_unlock(&server->rcv.creq_mutex);
printk(KERN_ERR "ncpfs: tcp: Server died\n");
pr_err("tcp: Server died\n");
return -EIO;
}
ncp_req_get(req);
Expand Down Expand Up @@ -448,7 +449,7 @@ void ncpdgram_rcv_proc(struct work_struct *work)
result -= 8;
hdrl = sock->sk->sk_family == AF_INET ? 8 : 6;
if (sign_verify_reply(server, server->rxbuf + hdrl, result - hdrl, cpu_to_le32(result), server->rxbuf + result)) {
printk(KERN_INFO "ncpfs: Signature violation\n");
pr_info("Signature violation\n");
result = -EIO;
}
}
Expand Down Expand Up @@ -524,7 +525,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len)
return result;
}
if (result > len) {
printk(KERN_ERR "ncpfs: tcp: bug in recvmsg (%u > %Zu)\n", result, len);
pr_err("tcp: bug in recvmsg (%u > %Zu)\n", result, len);
return -EIO;
}
return result;
Expand Down Expand Up @@ -552,7 +553,7 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
__ncptcp_abort(server);
}
if (result < 0) {
printk(KERN_ERR "ncpfs: tcp: error in recvmsg: %d\n", result);
pr_err("tcp: error in recvmsg: %d\n", result);
} else {
DPRINTK(KERN_ERR "ncpfs: tcp: EOF\n");
}
Expand All @@ -566,20 +567,20 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
switch (server->rcv.state) {
case 0:
if (server->rcv.buf.magic != htonl(NCP_TCP_RCVD_MAGIC)) {
printk(KERN_ERR "ncpfs: tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
pr_err("tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
__ncptcp_abort(server);
return -EIO;
}
datalen = ntohl(server->rcv.buf.len) & 0x0FFFFFFF;
if (datalen < 10) {
printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
pr_err("tcp: Unexpected reply len %d\n", datalen);
__ncptcp_abort(server);
return -EIO;
}
#ifdef CONFIG_NCPFS_PACKET_SIGNING
if (server->sign_active) {
if (datalen < 18) {
printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
pr_err("tcp: Unexpected reply len %d\n", datalen);
__ncptcp_abort(server);
return -EIO;
}
Expand Down Expand Up @@ -618,7 +619,7 @@ skipdata:;
goto skipdata2;
}
if (datalen > req->datalen + 8) {
printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
pr_err("tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
server->rcv.state = 3;
goto skipdata;
}
Expand All @@ -638,20 +639,20 @@ skipdata:;
req = server->rcv.creq;
if (req->tx_type != NCP_ALLOC_SLOT_REQUEST) {
if (((struct ncp_reply_header*)server->rxbuf)->sequence != server->sequence) {
printk(KERN_ERR "ncpfs: tcp: Bad sequence number\n");
pr_err("tcp: Bad sequence number\n");
__ncp_abort_request(server, req, -EIO);
return -EIO;
}
if ((((struct ncp_reply_header*)server->rxbuf)->conn_low | (((struct ncp_reply_header*)server->rxbuf)->conn_high << 8)) != server->connection) {
printk(KERN_ERR "ncpfs: tcp: Connection number mismatch\n");
pr_err("tcp: Connection number mismatch\n");
__ncp_abort_request(server, req, -EIO);
return -EIO;
}
}
#ifdef CONFIG_NCPFS_PACKET_SIGNING
if (server->sign_active && req->tx_type != NCP_DEALLOC_SLOT_REQUEST) {
if (sign_verify_reply(server, server->rxbuf + 6, req->datalen - 6, cpu_to_be32(req->datalen + 16), &server->rcv.buf.type)) {
printk(KERN_ERR "ncpfs: tcp: Signature violation\n");
pr_err("tcp: Signature violation\n");
__ncp_abort_request(server, req, -EIO);
return -EIO;
}
Expand Down Expand Up @@ -742,7 +743,7 @@ static int ncp_do_request(struct ncp_server *server, int size,
int result;

if (server->lock == 0) {
printk(KERN_ERR "ncpfs: Server not locked!\n");
pr_err("Server not locked!\n");
return -EIO;
}
if (!ncp_conn_valid(server)) {
Expand Down Expand Up @@ -865,14 +866,14 @@ void ncp_lock_server(struct ncp_server *server)
{
mutex_lock(&server->mutex);
if (server->lock)
printk(KERN_WARNING "ncp_lock_server: was locked!\n");
pr_warn("%s: was locked!\n", __func__);
server->lock = 1;
}

void ncp_unlock_server(struct ncp_server *server)
{
if (!server->lock) {
printk(KERN_WARNING "ncp_unlock_server: was not locked!\n");
pr_warn("%s: was not locked!\n", __func__);
return;
}
server->lock = 0;
Expand Down

0 comments on commit b41f8b8

Please sign in to comment.