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 <djwong@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
#define cond_resched() do { } while (0)
typedef unsigned int __be32;
#define cond_resched() do { } while (0)
typedef unsigned int __be32;
{
journal_revoke_header_t *header;
int offset, max;
{
journal_revoke_header_t *header;
int offset, max;
header = (journal_revoke_header_t *) bh->b_data;
offset = sizeof(journal_revoke_header_t);
max = be32_to_cpu(header->r_count);
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;
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;
err = journal_set_revoke(journal, blocknr, sequence);
if (err)
return err;