diff options
| author | Joern Engel <joern@logfs.org> | 2010-03-06 10:01:46 +0100 |
|---|---|---|
| committer | Joern Engel <joern@logfs.org> | 2010-03-06 10:01:46 +0100 |
| commit | 9cf05b416d3324457f1dd8be35f4eaa7a9640bed (patch) | |
| tree | 7a81abdbae27a6ab8882e3f722846a22720ce79d /fs | |
| parent | 6a08ab846cefc82a328cbf9abd96c2e58a6c3664 (diff) | |
| download | kernel_samsung_crespo-9cf05b416d3324457f1dd8be35f4eaa7a9640bed.zip kernel_samsung_crespo-9cf05b416d3324457f1dd8be35f4eaa7a9640bed.tar.gz kernel_samsung_crespo-9cf05b416d3324457f1dd8be35f4eaa7a9640bed.tar.bz2 | |
[LogFS] Remove h_version field
Incompatible change: h_compr is moved up so the padding is all in one chunk.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/logfs/journal.c | 7 | ||||
| -rw-r--r-- | fs/logfs/logfs_abi.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c index 57eb4fb..6ad30a4 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, { jh->h_len = cpu_to_be16(len); jh->h_type = cpu_to_be16(type); - jh->h_version = cpu_to_be16(++super->s_last_version); jh->h_datalen = cpu_to_be16(datalen); jh->h_compr = compr; jh->h_pad[0] = 'H'; - jh->h_pad[1] = 'A'; - jh->h_pad[2] = 'T'; + jh->h_pad[1] = 'E'; + jh->h_pad[2] = 'A'; + jh->h_pad[3] = 'D'; + jh->h_pad[4] = 'R'; jh->h_crc = logfs_crc32(jh, len + sizeof(*jh), 4); return ALIGN(len, 16) + sizeof(*jh); } diff --git a/fs/logfs/logfs_abi.h b/fs/logfs/logfs_abi.h index 8d4dd3d..d8cc957 100644 --- a/fs/logfs/logfs_abi.h +++ b/fs/logfs/logfs_abi.h @@ -422,7 +422,6 @@ SIZE_CHECK(logfs_segment_entry, 8); * not including header * @h_datalen: length of uncompressed data * @h_type: JE type - * @h_version: unnormalized version of journal entry * @h_compr: compression type * @h_pad: reserved */ @@ -431,9 +430,8 @@ struct logfs_journal_header { __be16 h_len; __be16 h_datalen; __be16 h_type; - __be16 h_version; __u8 h_compr; - __u8 h_pad[3]; + __u8 h_pad[5]; }; SIZE_CHECK(logfs_journal_header, 16); |