jffs2: Convert most D1/D2 macros to jffs2_dbg

D1 and D2 macros are mostly uses to emit debugging messages.

Convert the logging uses of D1 & D2 to jffs2_dbg(level, fmt, ...)
to be a bit more consistent style with the rest of the kernel.

All jffs2_dbg output is now at KERN_DEBUG where some of
the previous uses were emitted at various KERN_<LEVEL>s.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 18 insertions, 14 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 973ac5822bd7..01a07af0021d 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -79,7 +79,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
         uint32_t ino = 0;
         struct inode *inode = NULL;
 
-        D1(printk(KERN_DEBUG "jffs2_lookup()\n"));
+        jffs2_dbg(1, "jffs2_lookup()\n");
 
         if (target->d_name.len > JFFS2_MAX_NAME_LEN)
                 return ERR_PTR(-ENAMETOOLONG);
@@ -119,21 +119,22 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
         struct jffs2_full_dirent *fd;
         unsigned long offset, curofs;
 
-        D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino));
+        jffs2_dbg(1, "jffs2_readdir() for dir_i #%lu\n",
+                  filp->f_path.dentry->d_inode->i_ino);
 
         f = JFFS2_INODE_INFO(inode);
 
         offset = filp->f_pos;
 
         if (offset == 0) {
-                D1(printk(KERN_DEBUG "Dirent 0: \".\", ino #%lu\n", inode->i_ino));
+                jffs2_dbg(1, "Dirent 0: \".\", ino #%lu\n", inode->i_ino);
                 if (filldir(dirent, ".", 1, 0, inode->i_ino, DT_DIR) < 0)
                         goto out;
                 offset++;
         }
         if (offset == 1) {
                 unsigned long pino = parent_ino(filp->f_path.dentry);
-                D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino));
+                jffs2_dbg(1, "Dirent 1: \"..\", ino #%lu\n", pino);
                 if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)
                         goto out;
                 offset++;
@@ -146,16 +147,18 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 curofs++;
                 /* First loop: curofs = 2; offset = 2 */
                 if (curofs < offset) {
-                        D2(printk(KERN_DEBUG "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",
-                                  fd->name, fd->ino, fd->type, curofs, offset));
+                        jffs2_dbg(2, "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",
+                                  fd->name, fd->ino, fd->type, curofs, offset);
                         continue;
                 }
                 if (!fd->ino) {
-                        D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name));
+                        jffs2_dbg(2, "Skipping deletion dirent \"%s\"\n",
+                                  fd->name);
                         offset++;
                         continue;
                 }
-                D2(printk(KERN_DEBUG "Dirent %ld: \"%s\", ino #%u, type %d\n", offset, fd->name, fd->ino, fd->type));
+                jffs2_dbg(2, "Dirent %ld: \"%s\", ino #%u, type %d\n",
+                          offset, fd->name, fd->ino, fd->type);
                 if (filldir(dirent, fd->name, strlen(fd->name), offset, fd->ino, fd->type) < 0)
                         break;
                 offset++;
@@ -184,12 +187,12 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
 
         c = JFFS2_SB_INFO(dir_i->i_sb);
 
-        D1(printk(KERN_DEBUG "jffs2_create()\n"));
+        jffs2_dbg(1, "%s()\n", __func__);
 
         inode = jffs2_new_inode(dir_i, mode, ri);
 
         if (IS_ERR(inode)) {
-                D1(printk(KERN_DEBUG "jffs2_new_inode() failed\n"));
+                jffs2_dbg(1, "jffs2_new_inode() failed\n");
                 jffs2_free_raw_inode(ri);
                 return PTR_ERR(inode);
         }
@@ -217,9 +220,9 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
 
         jffs2_free_raw_inode(ri);
 
-        D1(printk(KERN_DEBUG "jffs2_create: Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",
-                  inode->i_ino, inode->i_mode, inode->i_nlink,
-                  f->inocache->pino_nlink, inode->i_mapping->nrpages));
+        jffs2_dbg(1, "%s(): Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",
+                  __func__, inode->i_ino, inode->i_mode, inode->i_nlink,
+                  f->inocache->pino_nlink, inode->i_mapping->nrpages);
 
         d_instantiate(dentry, inode);
         unlock_new_inode(inode);
@@ -369,7 +372,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
                 goto fail;
         }
 
-        D1(printk(KERN_DEBUG "jffs2_symlink: symlink's target '%s' cached\n", (char *)f->target));
+        jffs2_dbg(1, "%s(): symlink's target '%s' cached\n",
+                  __func__, (char *)f->target);
 
         /* No data here. Only a metadata node, which will be
            obsoleted by the first data write