aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/romfs/super.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/romfs/super.c b/fs/romfs/super.c
index ef90e8bca95a..c32006ea3d88 100644
--- a/fs/romfs/super.c
+++ b/fs/romfs/super.c
@@ -380,7 +380,7 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)
380eio: 380eio:
381 ret = -EIO; 381 ret = -EIO;
382error: 382error:
383 printk(KERN_ERR "ROMFS: read error for inode 0x%lx\n", pos); 383 pr_err("ROMFS: read error for inode 0x%lx\n", pos);
384 return ERR_PTR(ret); 384 return ERR_PTR(ret);
385} 385}
386 386
@@ -507,14 +507,13 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
507 if (rsb->word0 != ROMSB_WORD0 || rsb->word1 != ROMSB_WORD1 || 507 if (rsb->word0 != ROMSB_WORD0 || rsb->word1 != ROMSB_WORD1 ||
508 img_size < ROMFH_SIZE) { 508 img_size < ROMFH_SIZE) {
509 if (!silent) 509 if (!silent)
510 printk(KERN_WARNING "VFS:" 510 pr_warn("VFS: Can't find a romfs filesystem on dev %s.\n",
511 " Can't find a romfs filesystem on dev %s.\n",
512 sb->s_id); 511 sb->s_id);
513 goto error_rsb_inval; 512 goto error_rsb_inval;
514 } 513 }
515 514
516 if (romfs_checksum(rsb, min_t(size_t, img_size, 512))) { 515 if (romfs_checksum(rsb, min_t(size_t, img_size, 512))) {
517 printk(KERN_ERR "ROMFS: bad initial checksum on dev %s.\n", 516 pr_err("ROMFS: bad initial checksum on dev %s.\n",
518 sb->s_id); 517 sb->s_id);
519 goto error_rsb_inval; 518 goto error_rsb_inval;
520 } 519 }
@@ -523,7 +522,7 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
523 522
524 len = strnlen(rsb->name, ROMFS_MAXFN); 523 len = strnlen(rsb->name, ROMFS_MAXFN);
525 if (!silent) 524 if (!silent)
526 printk(KERN_NOTICE "ROMFS: Mounting image '%*.*s' through %s\n", 525 pr_notice("ROMFS: Mounting image '%*.*s' through %s\n",
527 (unsigned) len, (unsigned) len, rsb->name, storage); 526 (unsigned) len, (unsigned) len, rsb->name, storage);
528 527
529 kfree(rsb); 528 kfree(rsb);
@@ -614,7 +613,7 @@ static int __init init_romfs_fs(void)
614{ 613{
615 int ret; 614 int ret;
616 615
617 printk(KERN_INFO "ROMFS MTD (C) 2007 Red Hat, Inc.\n"); 616 pr_info("ROMFS MTD (C) 2007 Red Hat, Inc.\n");
618 617
619 romfs_inode_cachep = 618 romfs_inode_cachep =
620 kmem_cache_create("romfs_i", 619 kmem_cache_create("romfs_i",
@@ -623,13 +622,12 @@ static int __init init_romfs_fs(void)
623 romfs_i_init_once); 622 romfs_i_init_once);
624 623
625 if (!romfs_inode_cachep) { 624 if (!romfs_inode_cachep) {
626 printk(KERN_ERR 625 pr_err("ROMFS error: Failed to initialise inode cache\n");
627 "ROMFS error: Failed to initialise inode cache\n");
628 return -ENOMEM; 626 return -ENOMEM;
629 } 627 }
630 ret = register_filesystem(&romfs_fs_type); 628 ret = register_filesystem(&romfs_fs_type);
631 if (ret) { 629 if (ret) {
632 printk(KERN_ERR "ROMFS error: Failed to register filesystem\n"); 630 pr_err("ROMFS error: Failed to register filesystem\n");
633 goto error_register; 631 goto error_register;
634 } 632 }
635 return 0; 633 return 0;