Commit 9cf05b416d3324457f1dd8be35f4eaa7a9640bed
1 parent
6a08ab846c
Exists in
master
and in
7 other branches
[LogFS] Remove h_version field
Incompatible change: h_compr is moved up so the padding is all in one chunk.
Showing 2 changed files with 5 additions and 6 deletions Side-by-side Diff
fs/logfs/journal.c
| ... | ... | @@ -419,12 +419,13 @@ |
| 419 | 419 | { |
| 420 | 420 | jh->h_len = cpu_to_be16(len); |
| 421 | 421 | jh->h_type = cpu_to_be16(type); |
| 422 | - jh->h_version = cpu_to_be16(++super->s_last_version); | |
| 423 | 422 | jh->h_datalen = cpu_to_be16(datalen); |
| 424 | 423 | jh->h_compr = compr; |
| 425 | 424 | jh->h_pad[0] = 'H'; |
| 426 | - jh->h_pad[1] = 'A'; | |
| 427 | - jh->h_pad[2] = 'T'; | |
| 425 | + jh->h_pad[1] = 'E'; | |
| 426 | + jh->h_pad[2] = 'A'; | |
| 427 | + jh->h_pad[3] = 'D'; | |
| 428 | + jh->h_pad[4] = 'R'; | |
| 428 | 429 | jh->h_crc = logfs_crc32(jh, len + sizeof(*jh), 4); |
| 429 | 430 | return ALIGN(len, 16) + sizeof(*jh); |
| 430 | 431 | } |
fs/logfs/logfs_abi.h
| ... | ... | @@ -422,7 +422,6 @@ |
| 422 | 422 | * not including header |
| 423 | 423 | * @h_datalen: length of uncompressed data |
| 424 | 424 | * @h_type: JE type |
| 425 | - * @h_version: unnormalized version of journal entry | |
| 426 | 425 | * @h_compr: compression type |
| 427 | 426 | * @h_pad: reserved |
| 428 | 427 | */ |
| 429 | 428 | |
| ... | ... | @@ -431,9 +430,8 @@ |
| 431 | 430 | __be16 h_len; |
| 432 | 431 | __be16 h_datalen; |
| 433 | 432 | __be16 h_type; |
| 434 | - __be16 h_version; | |
| 435 | 433 | __u8 h_compr; |
| 436 | - __u8 h_pad[3]; | |
| 434 | + __u8 h_pad[5]; | |
| 437 | 435 | }; |
| 438 | 436 | |
| 439 | 437 | SIZE_CHECK(logfs_journal_header, 16); |