aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hpfs/super.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-06 17:36:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:10 -0400
commita19189e5535ed8fd191d8989fc39da1637cfa224 (patch)
tree015539572a32a74d37a72f8ef9dd35c0d9c1a0e0 /fs/hpfs/super.c
parent1749a10e02a9c6ed1a5c0a2860fb9ed132f2cc42 (diff)
fs/hpfs: increase pr_warn level
This patch applies a suggestion by Mikulas Patocka asking to increase all pr_warn without commented ones to pr_err Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hpfs/super.c')
-rw-r--r--fs/hpfs/super.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 92fd3cebeba4..7cd00d3a7c9b 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -438,7 +438,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
438 438
439 if (!(o = parse_opts(data, &uid, &gid, &umask, &lowercase, 439 if (!(o = parse_opts(data, &uid, &gid, &umask, &lowercase,
440 &eas, &chk, &errs, &chkdsk, &timeshift))) { 440 &eas, &chk, &errs, &chkdsk, &timeshift))) {
441 pr_warn("bad mount options.\n"); 441 pr_err("bad mount options.\n");
442 goto out_err; 442 goto out_err;
443 } 443 }
444 if (o == 2) { 444 if (o == 2) {
@@ -446,7 +446,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
446 goto out_err; 446 goto out_err;
447 } 447 }
448 if (timeshift != sbi->sb_timeshift) { 448 if (timeshift != sbi->sb_timeshift) {
449 pr_warn("timeshift can't be changed using remount.\n"); 449 pr_err("timeshift can't be changed using remount.\n");
450 goto out_err; 450 goto out_err;
451 } 451 }
452 452
@@ -527,7 +527,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
527 527
528 if (!(o = parse_opts(options, &uid, &gid, &umask, &lowercase, 528 if (!(o = parse_opts(options, &uid, &gid, &umask, &lowercase,
529 &eas, &chk, &errs, &chkdsk, &timeshift))) { 529 &eas, &chk, &errs, &chkdsk, &timeshift))) {
530 pr_warn("bad mount options.\n"); 530 pr_err("bad mount options.\n");
531 goto bail0; 531 goto bail0;
532 } 532 }
533 if (o==2) { 533 if (o==2) {
@@ -547,16 +547,16 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
547 ||*/ le32_to_cpu(superblock->magic) != SB_MAGIC 547 ||*/ le32_to_cpu(superblock->magic) != SB_MAGIC
548 || le32_to_cpu(spareblock->magic) != SP_MAGIC) { 548 || le32_to_cpu(spareblock->magic) != SP_MAGIC) {
549 if (!silent) 549 if (!silent)
550 pr_warn("Bad magic ... probably not HPFS\n"); 550 pr_err("Bad magic ... probably not HPFS\n");
551 goto bail4; 551 goto bail4;
552 } 552 }
553 553
554 /* Check version */ 554 /* Check version */
555 if (!(s->s_flags & MS_RDONLY) && 555 if (!(s->s_flags & MS_RDONLY) &&
556 superblock->funcversion != 2 && superblock->funcversion != 3) { 556 superblock->funcversion != 2 && superblock->funcversion != 3) {
557 pr_warn("Bad version %d,%d. Mount readonly to go around\n", 557 pr_err("Bad version %d,%d. Mount readonly to go around\n",
558 (int)superblock->version, (int)superblock->funcversion); 558 (int)superblock->version, (int)superblock->funcversion);
559 pr_warn("please try recent version of HPFS driver at http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi and if it still can't understand this format, contact author - mikulas@artax.karlin.mff.cuni.cz\n"); 559 pr_err("please try recent version of HPFS driver at http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi and if it still can't understand this format, contact author - mikulas@artax.karlin.mff.cuni.cz\n");
560 goto bail4; 560 goto bail4;
561 } 561 }
562 562
@@ -602,7 +602,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
602 /* Check for general fs errors*/ 602 /* Check for general fs errors*/
603 if (spareblock->dirty && !spareblock->old_wrote) { 603 if (spareblock->dirty && !spareblock->old_wrote) {
604 if (errs == 2) { 604 if (errs == 2) {
605 pr_warn("Improperly stopped, not mounted\n"); 605 pr_err("Improperly stopped, not mounted\n");
606 goto bail4; 606 goto bail4;
607 } 607 }
608 hpfs_error(s, "improperly stopped"); 608 hpfs_error(s, "improperly stopped");
@@ -616,25 +616,25 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
616 616
617 if (spareblock->hotfixes_used || spareblock->n_spares_used) { 617 if (spareblock->hotfixes_used || spareblock->n_spares_used) {
618 if (errs >= 2) { 618 if (errs >= 2) {
619 pr_warn("Hotfixes not supported here, try chkdsk\n"); 619 pr_err("Hotfixes not supported here, try chkdsk\n");
620 mark_dirty(s, 0); 620 mark_dirty(s, 0);
621 goto bail4; 621 goto bail4;
622 } 622 }
623 hpfs_error(s, "hotfixes not supported here, try chkdsk"); 623 hpfs_error(s, "hotfixes not supported here, try chkdsk");
624 if (errs == 0) 624 if (errs == 0)
625 pr_warn("Proceeding, but your filesystem will be probably corrupted by this driver...\n"); 625 pr_err("Proceeding, but your filesystem will be probably corrupted by this driver...\n");
626 else 626 else
627 pr_warn("This driver may read bad files or crash when operating on disk with hotfixes.\n"); 627 pr_err("This driver may read bad files or crash when operating on disk with hotfixes.\n");
628 } 628 }
629 if (le32_to_cpu(spareblock->n_dnode_spares) != le32_to_cpu(spareblock->n_dnode_spares_free)) { 629 if (le32_to_cpu(spareblock->n_dnode_spares) != le32_to_cpu(spareblock->n_dnode_spares_free)) {
630 if (errs >= 2) { 630 if (errs >= 2) {
631 pr_warn("Spare dnodes used, try chkdsk\n"); 631 pr_err("Spare dnodes used, try chkdsk\n");
632 mark_dirty(s, 0); 632 mark_dirty(s, 0);
633 goto bail4; 633 goto bail4;
634 } 634 }
635 hpfs_error(s, "warning: spare dnodes used, try chkdsk"); 635 hpfs_error(s, "warning: spare dnodes used, try chkdsk");
636 if (errs == 0) 636 if (errs == 0)
637 pr_warn("Proceeding, but your filesystem could be corrupted if you delete files or directories\n"); 637 pr_err("Proceeding, but your filesystem could be corrupted if you delete files or directories\n");
638 } 638 }
639 if (chk) { 639 if (chk) {
640 unsigned a; 640 unsigned a;
@@ -654,12 +654,12 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
654 } 654 }
655 sbi->sb_dirband_size = a; 655 sbi->sb_dirband_size = a;
656 } else 656 } else
657 pr_warn("You really don't want any checks? You are crazy...\n"); 657 pr_err("You really don't want any checks? You are crazy...\n");
658 658
659 /* Load code page table */ 659 /* Load code page table */
660 if (le32_to_cpu(spareblock->n_code_pages)) 660 if (le32_to_cpu(spareblock->n_code_pages))
661 if (!(sbi->sb_cp_table = hpfs_load_code_page(s, le32_to_cpu(spareblock->code_page_dir)))) 661 if (!(sbi->sb_cp_table = hpfs_load_code_page(s, le32_to_cpu(spareblock->code_page_dir))))
662 pr_warn("code page support is disabled\n"); 662 pr_err("code page support is disabled\n");
663 663
664 brelse(bh2); 664 brelse(bh2);
665 brelse(bh1); 665 brelse(bh1);