Skip to content

Commit

Permalink
[GFS2] Fix crc32 calculation in recovery.c
Browse files Browse the repository at this point in the history
Commit "[GFS2] split and annotate gfs2_log_head" resulted in an incorrect
checksum calculation for log headers. This patch corrects the
problem without resorting to copying the whole log header as
the previous code used to.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Nov 30, 2006
1 parent 5516762 commit 2a2c982
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/gfs2/recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,19 @@ static int get_log_header(struct gfs2_jdesc *jd, unsigned int blk,
{
struct buffer_head *bh;
struct gfs2_log_header_host lh;
static const u32 nothing = 0;
u32 hash;
int error;

error = gfs2_replay_read_block(jd, blk, &bh);
if (error)
return error;

memcpy(&lh, bh->b_data, sizeof(struct gfs2_log_header)); /* XXX */
lh.lh_hash = 0;
hash = gfs2_disk_hash((char *)&lh, sizeof(struct gfs2_log_header));
hash = crc32_le((u32)~0, bh->b_data, sizeof(struct gfs2_log_header) -
sizeof(u32));
hash = crc32_le(hash, (unsigned char const *)&nothing, sizeof(nothing));
hash ^= (u32)~0;
gfs2_log_header_in(&lh, bh->b_data);

brelse(bh);

if (lh.lh_header.mh_magic != GFS2_MAGIC ||
Expand Down

0 comments on commit 2a2c982

Please sign in to comment.