diff options
author | Joern Engel <joern@logfs.org> | 2010-03-06 04:01:46 -0500 |
---|---|---|
committer | Joern Engel <joern@logfs.org> | 2010-03-06 04:01:46 -0500 |
commit | 9cf05b416d3324457f1dd8be35f4eaa7a9640bed (patch) | |
tree | 7a81abdbae27a6ab8882e3f722846a22720ce79d /fs/logfs/journal.c | |
parent | 6a08ab846cefc82a328cbf9abd96c2e58a6c3664 (diff) |
[LogFS] Remove h_version field
Incompatible change: h_compr is moved up so the padding is all in one chunk.
Diffstat (limited to 'fs/logfs/journal.c')
-rw-r--r-- | fs/logfs/journal.c | 7 |
1 files changed, 4 insertions, 3 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 | } |