ncpfs: convert DPRINTK/DDPRINTK to ncp_dbg

Use a more current logging style and enable use of dynamic debugging.

Remove embedded function names, dynamic debug can add this instead.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 12 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 3277fc132959..f4c5bbafd73f 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -135,7 +135,7 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo)
         NCP_FINFO(inode)->access = nwinfo->access;
         memcpy(NCP_FINFO(inode)->file_handle, nwinfo->file_handle,
                         sizeof(nwinfo->file_handle));
-        DPRINTK("ncp_update_inode: updated %s, volnum=%d, dirent=%u\n",
+        ncp_dbg(1, "updated %s, volnum=%d, dirent=%u\n",
                 nwinfo->i.entryName, NCP_FINFO(inode)->volNumber,
                 NCP_FINFO(inode)->dirEntNum);
 }
@@ -143,8 +143,7 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo)
 static void ncp_update_dates(struct inode *inode, struct nw_info_struct *nwi)
 {
         /* NFS namespace mode overrides others if it's set. */
-        DPRINTK(KERN_DEBUG "ncp_update_dates_and_mode: (%s) nfs.mode=0%o\n",
-                nwi->entryName, nwi->nfs.mode);
+        ncp_dbg(1, "(%s) nfs.mode=0%o\n", nwi->entryName, nwi->nfs.mode);
         if (nwi->nfs.mode) {
                 /* XXX Security? */
                 inode->i_mode = nwi->nfs.mode;
@@ -232,7 +231,7 @@ static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo)
         
         ncp_update_attrs(inode, nwinfo);
 
-        DDPRINTK("ncp_read_inode: inode->i_mode = %u\n", inode->i_mode);
+        ncp_dbg(2, "inode->i_mode = %u\n", inode->i_mode);
 
         set_nlink(inode, 1);
         inode->i_uid = server->m.uid;
@@ -303,7 +302,7 @@ ncp_evict_inode(struct inode *inode)
         clear_inode(inode);
 
         if (S_ISDIR(inode->i_mode)) {
-                DDPRINTK("ncp_evict_inode: put directory %ld\n", inode->i_ino);
+                ncp_dbg(2, "put directory %ld\n", inode->i_ino);
         }
 
         if (ncp_make_closed(inode) != 0) {
@@ -684,7 +683,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         ncp_unlock_server(server);
         if (error < 0)
                 goto out_rxbuf;
-        DPRINTK("ncp_fill_super: NCP_SBP(sb) = %x\n", (int) NCP_SBP(sb));
+        ncp_dbg(1, "NCP_SBP(sb) = %x\n", (int) NCP_SBP(sb));
 
         error = -EMSGSIZE;      /* -EREMOTESIDEINCOMPATIBLE */
 #ifdef CONFIG_NCPFS_PACKET_SIGNING
@@ -712,7 +711,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (ncp_negotiate_buffersize(server, default_bufsize,
                                      &(server->buffer_size)) != 0)
                 goto out_disconnect;
-        DPRINTK("ncpfs: bufsize = %d\n", server->buffer_size);
+        ncp_dbg(1, "bufsize = %d\n", server->buffer_size);
 
         memset(&finfo, 0, sizeof(finfo));
         finfo.i.attributes      = aDIR;
@@ -741,7 +740,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         root_inode = ncp_iget(sb, &finfo);
         if (!root_inode)
                 goto out_disconnect;
-        DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber);
+        ncp_dbg(1, "root vol=%d\n", NCP_FINFO(root_inode)->volNumber);
         sb->s_root = d_make_root(root_inode);
         if (!sb->s_root)
                 goto out_disconnect;
@@ -987,8 +986,7 @@ int ncp_notify_change(struct dentry *dentry, struct iattr *attr)
         if ((attr->ia_valid & ATTR_SIZE) != 0) {
                 int written;
 
-                DPRINTK("ncpfs: trying to change size to %ld\n",
-                        attr->ia_size);
+                ncp_dbg(1, "trying to change size to %ld\n", attr->ia_size);
 
                 if ((result = ncp_make_open(inode, O_WRONLY)) < 0) {
                         result = -EACCES;
@@ -1074,7 +1072,7 @@ MODULE_ALIAS_FS("ncpfs");
 static int __init init_ncp_fs(void)
 {
         int err;
-        DPRINTK("ncpfs: init_ncp_fs called\n");
+        ncp_dbg(1, "called\n");
 
         err = init_inodecache();
         if (err)
@@ -1091,7 +1089,7 @@ out1:
 
 static void __exit exit_ncp_fs(void)
 {
-        DPRINTK("ncpfs: exit_ncp_fs called\n");
+        ncp_dbg(1, "called\n");
         unregister_filesystem(&ncp_fs_type);
         destroy_inodecache();
 }