mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/fs/nilfs2/recovery.c
..
..
@@ -51,7 +51,7 @@
51
51
 
52
52
 	switch (err) {
53
53
 	case NILFS_SEG_FAIL_IO:
54
-		nilfs_msg(sb, KERN_ERR, "I/O error reading segment");
54
+		nilfs_err(sb, "I/O error reading segment");
55
55
 		return -EIO;
56
56
 	case NILFS_SEG_FAIL_MAGIC:
57
57
 		msg = "Magic number mismatch";
..
..
@@ -72,10 +72,10 @@
72
72
 		msg = "No super root in the last segment";
73
73
 		break;
74
74
 	default:
75
-		nilfs_msg(sb, KERN_ERR, "unrecognized segment error %d", err);
75
+		nilfs_err(sb, "unrecognized segment error %d", err);
76
76
 		return -EINVAL;
77
77
 	}
78
-	nilfs_msg(sb, KERN_WARNING, "invalid segment: %s", msg);
78
+	nilfs_warn(sb, "invalid segment: %s", msg);
79
79
 	return -EINVAL;
80
80
 }
81
81
 
..
..
@@ -543,10 +543,10 @@
543
543
 		put_page(page);
544
544
 
545
545
  failed_inode:
546
-		nilfs_msg(sb, KERN_WARNING,
547
-			  "error %d recovering data block (ino=%lu, block-offset=%llu)",
548
-			  err, (unsigned long)rb->ino,
549
-			  (unsigned long long)rb->blkoff);
546
+		nilfs_warn(sb,
547
+			   "error %d recovering data block (ino=%lu, block-offset=%llu)",
548
+			   err, (unsigned long)rb->ino,
549
+			   (unsigned long long)rb->blkoff);
550
550
 		if (!err2)
551
551
 			err2 = err;
552
552
  next:
..
..
@@ -626,7 +626,7 @@
626
626
 			    !(flags & NILFS_SS_SYNDT))
627
627
 				goto try_next_pseg;
628
628
 			state = RF_DSYNC_ST;
629
-			/* Fall through */
629
+			fallthrough;
630
630
 		case RF_DSYNC_ST:
631
631
 			if (!(flags & NILFS_SS_SYNDT))
632
632
 				goto confused;
..
..
@@ -669,8 +669,7 @@
669
669
 	}
670
670
 
671
671
 	if (nsalvaged_blocks) {
672
-		nilfs_msg(sb, KERN_INFO, "salvaged %lu blocks",
673
-			  nsalvaged_blocks);
672
+		nilfs_info(sb, "salvaged %lu blocks", nsalvaged_blocks);
674
673
 		ri->ri_need_recovery = NILFS_RECOVERY_ROLLFORWARD_DONE;
675
674
 	}
676
675
  out:
..
..
@@ -681,7 +680,7 @@
681
680
  confused:
682
681
 	err = -EINVAL;
683
682
  failed:
684
-	nilfs_msg(sb, KERN_ERR,
683
+	nilfs_err(sb,
685
684
 		  "error %d roll-forwarding partial segment at blocknr = %llu",
686
685
 		  err, (unsigned long long)pseg_start);
687
686
 	goto out;
..
..
@@ -703,8 +702,8 @@
703
702
 	set_buffer_dirty(bh);
704
703
 	err = sync_dirty_buffer(bh);
705
704
 	if (unlikely(err))
706
-		nilfs_msg(nilfs->ns_sb, KERN_WARNING,
707
-			  "buffer sync write failed during post-cleaning of recovery.");
705
+		nilfs_warn(nilfs->ns_sb,
706
+			   "buffer sync write failed during post-cleaning of recovery.");
708
707
 	brelse(bh);
709
708
 }
710
709
 
..
..
@@ -739,8 +738,7 @@
739
738
 
740
739
 	err = nilfs_attach_checkpoint(sb, ri->ri_cno, true, &root);
741
740
 	if (unlikely(err)) {
742
-		nilfs_msg(sb, KERN_ERR,
743
-			  "error %d loading the latest checkpoint", err);
741
+		nilfs_err(sb, "error %d loading the latest checkpoint", err);
744
742
 		return err;
745
743
 	}
746
744
 
..
..
@@ -751,8 +749,7 @@
751
749
 	if (ri->ri_need_recovery == NILFS_RECOVERY_ROLLFORWARD_DONE) {
752
750
 		err = nilfs_prepare_segment_for_recovery(nilfs, sb, ri);
753
751
 		if (unlikely(err)) {
754
-			nilfs_msg(sb, KERN_ERR,
755
-				  "error %d preparing segment for recovery",
752
+			nilfs_err(sb, "error %d preparing segment for recovery",
756
753
 				  err);
757
754
 			goto failed;
758
755
 		}
..
..
@@ -766,8 +763,7 @@
766
763
 		nilfs_detach_log_writer(sb);
767
764
 
768
765
 		if (unlikely(err)) {
769
-			nilfs_msg(sb, KERN_ERR,
770
-				  "error %d writing segment for recovery",
766
+			nilfs_err(sb, "error %d writing segment for recovery",
771
767
 				  err);
772
768
 			goto failed;
773
769
 		}