Skip to contentSkip to conversation

Fix crc32 calculation in recovery.c [8/70]

GFS2 Steven Whitehouse 2 participants 4 messages Nov 30, 2006 – Dec 7, 2006 GFS2 file system

lore
Share & tools
lore
#0 lore raw
Quoted 1 line

From 2a2c98247b822db8df037a56c27201f9d716ac66 Mon Sep 17 00:00:00 2001

From: Steven Whitehouse <[email protected]>
Date: Tue, 31 Oct 2006 14:44:50 -0500
Subject: [PATCH] [GFS2] Fix crc32 calculation in recovery.c

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.

---
 fs/gfs2/recovery.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
fs/gfs2/recovery.c +5 -4
index 4478162..4acf238 100644
@@ -136,6 +136,7 @@ static int get_log_header(struct gfs2_jd
 {
 	struct buffer_head *bh;
 	struct gfs2_log_header_host lh;
+static const u32 nothing = 0;
 	u32 hash;
 	int error;
 
@@ -143,11 +144,11 @@ static int get_log_header(struct gfs2_jd
 	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 ||
Signature · 1 line
1.4.1
#1 lore raw
Quoted 17 lines

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.

---
fs/gfs2/recovery.c | 9 +++++----

1 files changed, 5 insertions(+), 4 deletions(-)
fs/gfs2/recovery.c +0 -0
index 4478162..4acf238 100644

fs/gfs2/recovery.c static int get_log_header(struct gfs2_jd · line 142

Quoted 7 lines
fs/gfs2/recovery.c +1 -0
@@ -136,6 +136,7 @@ static int get_log_header(struct gfs2_jd
 {
 	struct buffer_head *bh;
 	struct gfs2_log_header_host lh;
+static const u32 nothing = 0;
 	u32 hash;
 	int error;
 

At least indent it.

Quoted 18 lines
fs/gfs2/recovery.c +4 -4
@@ -143,11 +144,11 @@ static int get_log_header(struct gfs2_jd
 	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 ||
Signature · 1 line
1.4.1
	-`J'
#2 lore raw

Hi,

Quoted 11 lines · Jan Engelhardt
Quoted 11 lines

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.

---
fs/gfs2/recovery.c | 9 +++++----

1 files changed, 5 insertions(+), 4 deletions(-)
Quoted 15 lines

fs/gfs2/recovery.c static int get_log_header(struct gfs2_jd · line 142

Quoted 12 lines
fs/gfs2/recovery.c +1 -0
index 4478162..4acf238 100644
@@ -136,6 +136,7 @@ static int get_log_header(struct gfs2_jd
 {
 	struct buffer_head *bh;
 	struct gfs2_log_header_host lh;
+static const u32 nothing = 0;
 	u32 hash;
 	int error;
 

At least indent it.

I've had a private email from someone pointing out the same thing. It was not intended to emphasise the fact that it is static, I'm not sure if thats the "right thing" or not, but either way, it doesn't actually need to be static, so that I've agreed that I'll remove the static and just leave it as const and fix the indenting at the same time,

Steve.

#3 lore raw
In reply to Jan Engelhardt

Hi,

Quoted 11 lines · Jan Engelhardt
Quoted 11 lines

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.

---
fs/gfs2/recovery.c | 9 +++++----

1 files changed, 5 insertions(+), 4 deletions(-)
Quoted 15 lines

fs/gfs2/recovery.c static int get_log_header(struct gfs2_jd · line 142

Quoted 12 lines
fs/gfs2/recovery.c +1 -0
index 4478162..4acf238 100644
@@ -136,6 +136,7 @@ static int get_log_header(struct gfs2_jd
 {
 	struct buffer_head *bh;
 	struct gfs2_log_header_host lh;
+static const u32 nothing = 0;
 	u32 hash;
 	int error;
 

At least indent it.

As per your comment and also Andrew Morton's similar remark, here is the patch I'm just about to add to the tree,

Steve.

---------------------------------------------------------------------------------------

Quoted 1 line

From 887bc5d00c02b32763845247024e8db5243ef857 Mon Sep 17 00:00:00 2001

From: Steven Whitehouse <[email protected]>
Date: Tue, 5 Dec 2006 13:34:17 -0500
Subject: [PATCH] [GFS2] Fix indent in recovery.c

As per comments from Andrew Morton and Jan Engelhardt, this fixes the indent and removes the "static" from a variable declaration since its not needed in this case (now allocated on the stack of the function in question).

Cc Jan Engelhardt <[email protected]>
Cc Andrew Morton <[email protected]>
---
 fs/gfs2/recovery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/gfs2/recovery.c +1 -1
index 4acf238..d0c806b 100644
@@ -136,7 +136,7 @@ static int get_log_header(struct gfs2_jd
 {
 	struct buffer_head *bh;
 	struct gfs2_log_header_host lh;
-static const u32 nothing = 0;
+	const u32 nothing = 0;
 	u32 hash;
 	int error;
 
Signature · 1 line
1.4.1