aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/logfs/journal.c7
-rw-r--r--fs/logfs/logfs_abi.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c
index 57eb4fb444a9..6ad30a4c9052 100644
--- a/fs/logfs/journal.c
+++ b/fs/logfs/journal.c
@@ -419,12 +419,13 @@ static size_t __logfs_write_header(struct logfs_super *super,
419{ 419{
420 jh->h_len = cpu_to_be16(len); 420 jh->h_len = cpu_to_be16(len);
421 jh->h_type = cpu_to_be16(type); 421 jh->h_type = cpu_to_be16(type);
422 jh->h_version = cpu_to_be16(++super->s_last_version);
423 jh->h_datalen = cpu_to_be16(datalen); 422 jh->h_datalen = cpu_to_be16(datalen);
424 jh->h_compr = compr; 423 jh->h_compr = compr;
425 jh->h_pad[0] = 'H'; 424 jh->h_pad[0] = 'H';
426 jh->h_pad[1] = 'A'; 425 jh->h_pad[1] = 'E';
427 jh->h_pad[2] = 'T'; 426 jh->h_pad[2] = 'A';
427 jh->h_pad[3] = 'D';
428 jh->h_pad[4] = 'R';
428 jh->h_crc = logfs_crc32(jh, len + sizeof(*jh), 4); 429 jh->h_crc = logfs_crc32(jh, len + sizeof(*jh), 4);
429 return ALIGN(len, 16) + sizeof(*jh); 430 return ALIGN(len, 16) + sizeof(*jh);
430} 431}
diff --git a/fs/logfs/logfs_abi.h b/fs/logfs/logfs_abi.h
index 8d4dd3de551e..d8cc95734a60 100644
--- a/fs/logfs/logfs_abi.h
+++ b/fs/logfs/logfs_abi.h
@@ -422,7 +422,6 @@ SIZE_CHECK(logfs_segment_entry, 8);
422 * not including header 422 * not including header
423 * @h_datalen: length of uncompressed data 423 * @h_datalen: length of uncompressed data
424 * @h_type: JE type 424 * @h_type: JE type
425 * @h_version: unnormalized version of journal entry
426 * @h_compr: compression type 425 * @h_compr: compression type
427 * @h_pad: reserved 426 * @h_pad: reserved
428 */ 427 */
@@ -431,9 +430,8 @@ struct logfs_journal_header {
431 __be16 h_len; 430 __be16 h_len;
432 __be16 h_datalen; 431 __be16 h_datalen;
433 __be16 h_type; 432 __be16 h_type;
434 __be16 h_version;
435 __u8 h_compr; 433 __u8 h_compr;
436 __u8 h_pad[3]; 434 __u8 h_pad[5];
437}; 435};
438 436
439SIZE_CHECK(logfs_journal_header, 16); 437SIZE_CHECK(logfs_journal_header, 16);