diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-12-20 10:06:58 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-12-20 10:06:58 -0500 |
| commit | 562f264243f4d4385910b6f06872730214977736 (patch) | |
| tree | d673913265ee31f690474f5c1f8929657c4096af /e2fsck | |
| parent | 25623feab4789b86880da8ded5605ff17ebf3908 (diff) | |
| parent | 9098c986b64bb65a2b7fcd2724a400ba1f451f6b (diff) | |
| download | e2fsprogs-562f264243f4d4385910b6f06872730214977736.tar.gz | |
Merge branch 'maint' into next
Conflicts:
lib/ext2fs/block.c
lib/ext2fs/csum.c
resize/main.c
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/recovery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index 8e405756..cac9294c 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -536,8 +536,10 @@ static int do_one_pass(journal_t *journal, memcpy(nbh->b_data, obh->b_data, journal->j_blocksize); if (flags & JFS_FLAG_ESCAPE) { - *((__be32 *)nbh->b_data) = - cpu_to_be32(JFS_MAGIC_NUMBER); + journal_header_t *header; + + header = (journal_header_t *) &nbh->b_data[0]; + header->h_magic = cpu_to_be32(JFS_MAGIC_NUMBER); } BUFFER_TRACE(nbh, "marking dirty"); |