enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/fs/ext4/fsmap.c
..
..
@@ -280,7 +280,7 @@
280
280
 
281
281
 	/* Fabricate an rmap entry for the external log device. */
282
282
 	irec.fmr_physical = journal->j_blk_offset;
283
-	irec.fmr_length = journal->j_maxlen;
283
+	irec.fmr_length = journal->j_total_len;
284
284
 	irec.fmr_owner = EXT4_FMR_OWN_LOG;
285
285
 	irec.fmr_flags = 0;
286
286
 
..
..
@@ -574,8 +574,8 @@
574
574
 	if (fm->fmr_device == 0 || fm->fmr_device == UINT_MAX ||
575
575
 	    fm->fmr_device == new_encode_dev(sb->s_bdev->bd_dev))
576
576
 		return true;
577
-	if (EXT4_SB(sb)->journal_bdev &&
578
-	    fm->fmr_device == new_encode_dev(EXT4_SB(sb)->journal_bdev->bd_dev))
577
+	if (EXT4_SB(sb)->s_journal_bdev &&
578
+	    fm->fmr_device == new_encode_dev(EXT4_SB(sb)->s_journal_bdev->bd_dev))
579
579
 		return true;
580
580
 	return false;
581
581
 }
..
..
@@ -629,7 +629,7 @@
629
629
 {
630
630
 	struct ext4_fsmap dkeys[2];	/* per-dev keys */
631
631
 	struct ext4_getfsmap_dev handlers[EXT4_GETFSMAP_DEVS];
632
-	struct ext4_getfsmap_info info = {0};
632
+	struct ext4_getfsmap_info info = { NULL };
633
633
 	int i;
634
634
 	int error = 0;
635
635
 
..
..
@@ -645,9 +645,9 @@
645
645
 	memset(handlers, 0, sizeof(handlers));
646
646
 	handlers[0].gfd_dev = new_encode_dev(sb->s_bdev->bd_dev);
647
647
 	handlers[0].gfd_fn = ext4_getfsmap_datadev;
648
-	if (EXT4_SB(sb)->journal_bdev) {
648
+	if (EXT4_SB(sb)->s_journal_bdev) {
649
649
 		handlers[1].gfd_dev = new_encode_dev(
650
-				EXT4_SB(sb)->journal_bdev->bd_dev);
650
+				EXT4_SB(sb)->s_journal_bdev->bd_dev);
651
651
 		handlers[1].gfd_fn = ext4_getfsmap_logdev;
652
652
 	}
653
653