aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r--fs/jffs2/super.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 3600e3e508e5..9e3ba7f0a893 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -214,8 +214,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data)
214 JFFS2_COMPR_MODE_FORCEZLIB; 214 JFFS2_COMPR_MODE_FORCEZLIB;
215#endif 215#endif
216 else { 216 else {
217 printk(KERN_ERR "JFFS2 Error: unknown compressor \"%s\"", 217 pr_err("JFFS2 Error: unknown compressor \"%s\"",
218 name); 218 name);
219 kfree(name); 219 kfree(name);
220 return -EINVAL; 220 return -EINVAL;
221 } 221 }
@@ -223,8 +223,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data)
223 c->mount_opts.override_compr = true; 223 c->mount_opts.override_compr = true;
224 break; 224 break;
225 default: 225 default:
226 printk(KERN_ERR "JFFS2 Error: unrecognized mount option '%s' or missing value\n", 226 pr_err("JFFS2 Error: unrecognized mount option '%s' or missing value\n",
227 p); 227 p);
228 return -EINVAL; 228 return -EINVAL;
229 } 229 }
230 } 230 }
@@ -371,7 +371,7 @@ static int __init init_jffs2_fs(void)
371 BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); 371 BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
372 BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); 372 BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
373 373
374 printk(KERN_INFO "JFFS2 version 2.2." 374 pr_info("JFFS2 version 2.2."
375#ifdef CONFIG_JFFS2_FS_WRITEBUFFER 375#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
376 " (NAND)" 376 " (NAND)"
377#endif 377#endif
@@ -386,22 +386,22 @@ static int __init init_jffs2_fs(void)
386 SLAB_MEM_SPREAD), 386 SLAB_MEM_SPREAD),
387 jffs2_i_init_once); 387 jffs2_i_init_once);
388 if (!jffs2_inode_cachep) { 388 if (!jffs2_inode_cachep) {
389 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); 389 pr_err("JFFS2 error: Failed to initialise inode cache\n");
390 return -ENOMEM; 390 return -ENOMEM;
391 } 391 }
392 ret = jffs2_compressors_init(); 392 ret = jffs2_compressors_init();
393 if (ret) { 393 if (ret) {
394 printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n"); 394 pr_err("JFFS2 error: Failed to initialise compressors\n");
395 goto out; 395 goto out;
396 } 396 }
397 ret = jffs2_create_slab_caches(); 397 ret = jffs2_create_slab_caches();
398 if (ret) { 398 if (ret) {
399 printk(KERN_ERR "JFFS2 error: Failed to initialise slab caches\n"); 399 pr_err("JFFS2 error: Failed to initialise slab caches\n");
400 goto out_compressors; 400 goto out_compressors;
401 } 401 }
402 ret = register_filesystem(&jffs2_fs_type); 402 ret = register_filesystem(&jffs2_fs_type);
403 if (ret) { 403 if (ret) {
404 printk(KERN_ERR "JFFS2 error: Failed to register filesystem\n"); 404 pr_err("JFFS2 error: Failed to register filesystem\n");
405 goto out_slab; 405 goto out_slab;
406 } 406 }
407 return 0; 407 return 0;