2011-10-08 07:29:16

by djwong

Subject: [PATCH] e2fsck: Recover revoke blocks on 64bit filesystems correctly

Since the advent of 64bit filesystems, revoke blocks store 64-bit block numbers
instead of 32-bit block numbers. Therefore we need to be able to handle that
case.

Signed-off-by: Darrick J. Wong <[email protected]>
---
e2fsck/jfs_user.h | 1 +
e2fsck/recovery.c | 13 +++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h
index 2bb71c3..9e33306 100644
--- a/e2fsck/jfs_user.h
+++ b/e2fsck/jfs_user.h
@@ -62,6 +62,7 @@ typedef struct {
#define cond_resched() do { } while (0)

typedef unsigned int __be32;
+typedef __u64 __be64;

#define __init

diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index a587bd7..b669941 100644
--- a/e2fsck/recovery.c
+++ b/e2fsck/recovery.c
@@ -723,17 +723,26 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,
{
journal_revoke_header_t *header;
int offset, max;
+ int record_len = 4;

header = (journal_revoke_header_t *) bh->b_data;
offset = sizeof(journal_revoke_header_t);
max = be32_to_cpu(header->r_count);

+ if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT))
+ record_len = 8;
+
while (offset < max) {
unsigned long blocknr;
int err;

- blocknr = be32_to_cpu(* ((__be32 *) (bh->b_data+offset)));
- offset += 4;
+ if (record_len == 4)
+ blocknr = ext2fs_be32_to_cpu(*((__be32 *)(bh->b_data +
+ offset)));
+ else
+ blocknr = ext2fs_be64_to_cpu(*((__be64 *)(bh->b_data +
+ offset)));
+ offset += record_len;
err = journal_set_revoke(journal, blocknr, sequence);
if (err)
return err;

2011-10-08 17:37:45

by Theodore Ts'o

Subject: Re: [PATCH] e2fsck: Recover revoke blocks on 64bit filesystems correctly

On Sat, Oct 08, 2011 at 12:29:09AM -0700, Darrick J. Wong wrote:
> Since the advent of 64bit filesystems, revoke blocks store 64-bit block numbers
> instead of 32-bit block numbers. Therefore we need to be able to handle that
> case.
>
> Signed-off-by: Darrick J. Wong <[email protected]>

Thanks, applied.

- Ted