Documentation and implementation of the ext4 super block have slightly diverged: Padding has been removed in order to make room for new fields that are still missing in the documentation. Add the new fields s_encryption_level, s_first_error_errorcode, s_last_error_errorcode to the documentation of the ext4 super block. Fixes: f542fbe8d5e8 ("ext4 crypto: reserve codepoints used by the ext4 encryption feature") Fixes: 878520ac45f9 ("ext4: save the error code which triggered an ext4_error() in the superblock")
Unified · Split
| @@ -328,9 +328,13 @@ The ext4 superblock is laid out as follows in · 327 unmodified lines | |||
| 328 | - s_checksum_type | 328 | - s_checksum_type |
| 329 | - Metadata checksum algorithm type. The only valid value is 1 (crc32c). | 329 | - Metadata checksum algorithm type. The only valid value is 1 (crc32c). |
| 330 | * - 0x176 | 330 | * - 0x176 |
| 331 | - __le16 | 331 | - \_\_u8 |
| 332 | - s_reserved_pad | 332 | - s\_encryption\_level |
| 333 | - | 333 | - Versioning level for encryption. |
| 334 | * - 0x177 | ||
| 335 | - \_\_u8 | ||
| 336 | - s\_reserved\_pad | ||
| 337 | - Padding to next 32bits. | ||
| 334 | * - 0x178 | 338 | * - 0x178 |
| 335 | - __le64 | 339 | - __le64 |
| 336 | - s_kbytes_written | 340 | - s_kbytes_written |
| @@ -466,9 +470,13 @@ The ext4 superblock is laid out as follows in · 129 unmodified lines | |||
| 466 | - s_last_error_time_hi | 470 | - s_last_error_time_hi |
| 467 | - Upper 8 bits of the s_last_error_time field. | 471 | - Upper 8 bits of the s_last_error_time field. |
| 468 | * - 0x27A | 472 | * - 0x27A |
| 469 | - __u8 | 473 | - \_\_u8 |
| 470 | - s_pad[2] | 474 | - s\_first\_error\_errcode |
| 471 | - Zero padding. | 475 | - |
| 476 | * - 0x27B | ||
| 477 | - \_\_u8 | ||
| 478 | - s\_last\_error\_errcode | ||
| 479 | - | ||
| 472 | * - 0x27C | 480 | * - 0x27C |
| 473 | - __le16 | 481 | - __le16 |
| 474 | - s_encoding | 482 | - s_encoding |