usb: gadget: dummy_hcd: fix build when BUG is not set

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / jffs2 / dir.c

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 973ac5822bd7814cd8f4e6d43ae31c2a3b3f6d84..b56018896d5e398b3f5bce94776db8dd0cf9de37 100644 (file)
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -10,6 +10,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
@@ -79,7 +81,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);
@@ -103,7 +105,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
        if (ino) {
                inode = jffs2_iget(dir_i->i_sb, ino);
                if (IS_ERR(inode))
-                       printk(KERN_WARNING "iget() failed for ino #%u\n", ino);
+                       pr_warn("iget() failed for ino #%u\n", ino);
        }
 
        return d_splice_alias(inode, target);
@@ -119,21 +121,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 +149,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 +189,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 +222,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);
@@ -362,14 +367,15 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
        /* We use f->target field to store the target path. */
        f->target = kmemdup(target, targetlen + 1, GFP_KERNEL);
        if (!f->target) {
-               printk(KERN_WARNING "Can't allocate %d bytes of memory\n", targetlen + 1);
+               pr_warn("Can't allocate %d bytes of memory\n", targetlen + 1);
                mutex_unlock(&f->sem);
                jffs2_complete_reservation(c);
                ret = -ENOMEM;
                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
@@ -856,7 +862,8 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
                        f->inocache->pino_nlink++;
                mutex_unlock(&f->sem);
 
-               printk(KERN_NOTICE "jffs2_rename(): Link succeeded, unlink failed (err %d). You now have a hard link\n", ret);
+               pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n",
+                         __func__, ret);
                /* Might as well let the VFS know */
                d_instantiate(new_dentry, old_dentry->d_inode);
                ihold(old_dentry->d_inode);