Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

[firefly-linux-kernel-4.4.55.git] / fs / romfs / super.c

diff --git a/fs/romfs/super.c b/fs/romfs/super.c
index ef90e8bca95ac77e6808a300eb053d36911db523..e98dd88197d50241eec236575573bc5cab924aa4 100644 (file)
--- a/fs/romfs/super.c
+++ b/fs/romfs/super.c
@@ -56,6 +56,8 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
@@ -380,7 +382,7 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)
 eio:
        ret = -EIO;
 error:
-       printk(KERN_ERR "ROMFS: read error for inode 0x%lx\n", pos);
+       pr_err("read error for inode 0x%lx\n", pos);
        return ERR_PTR(ret);
 }
 
@@ -390,6 +392,7 @@ error:
 static struct inode *romfs_alloc_inode(struct super_block *sb)
 {
        struct romfs_inode_info *inode;
+
        inode = kmem_cache_alloc(romfs_inode_cachep, GFP_KERNEL);
        return inode ? &inode->vfs_inode : NULL;
 }
@@ -400,6 +403,7 @@ static struct inode *romfs_alloc_inode(struct super_block *sb)
 static void romfs_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
+
        kmem_cache_free(romfs_inode_cachep, ROMFS_I(inode));
 }
 
@@ -507,15 +511,13 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
        if (rsb->word0 != ROMSB_WORD0 || rsb->word1 != ROMSB_WORD1 ||
            img_size < ROMFH_SIZE) {
                if (!silent)
-                       printk(KERN_WARNING "VFS:"
-                              " Can't find a romfs filesystem on dev %s.\n",
+                       pr_warn("VFS: Can't find a romfs filesystem on dev %s.\n",
                               sb->s_id);
                goto error_rsb_inval;
        }
 
        if (romfs_checksum(rsb, min_t(size_t, img_size, 512))) {
-               printk(KERN_ERR "ROMFS: bad initial checksum on dev %s.\n",
-                      sb->s_id);
+               pr_err("bad initial checksum on dev %s.\n", sb->s_id);
                goto error_rsb_inval;
        }
 
@@ -523,8 +525,8 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
 
        len = strnlen(rsb->name, ROMFS_MAXFN);
        if (!silent)
-               printk(KERN_NOTICE "ROMFS: Mounting image '%*.*s' through %s\n",
-                      (unsigned) len, (unsigned) len, rsb->name, storage);
+               pr_notice("Mounting image '%*.*s' through %s\n",
+                         (unsigned) len, (unsigned) len, rsb->name, storage);
 
        kfree(rsb);
        rsb = NULL;
@@ -614,7 +616,7 @@ static int __init init_romfs_fs(void)
 {
        int ret;
 
-       printk(KERN_INFO "ROMFS MTD (C) 2007 Red Hat, Inc.\n");
+       pr_info("ROMFS MTD (C) 2007 Red Hat, Inc.\n");
 
        romfs_inode_cachep =
                kmem_cache_create("romfs_i",
@@ -623,13 +625,12 @@ static int __init init_romfs_fs(void)
                                  romfs_i_init_once);
 
        if (!romfs_inode_cachep) {
-               printk(KERN_ERR
-                      "ROMFS error: Failed to initialise inode cache\n");
+               pr_err("Failed to initialise inode cache\n");
                return -ENOMEM;
        }
        ret = register_filesystem(&romfs_fs_type);
        if (ret) {
-               printk(KERN_ERR "ROMFS error: Failed to register filesystem\n");
+               pr_err("Failed to register filesystem\n");
                goto error_register;
        }
        return 0;