Commit 4009cc7a authored by Theodore Ts'o's avatar Theodore Ts'o

jbd2: clean up two gcc -Wall warnings in recovery.c

Fix a signed vs unsigned and a void * pointer arithmetic warning.

This cleanup is also in e2fsprogs commit aec460db9a93 ("e2fsck: clean
up two gcc -Wall warnings in recovery.c").
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 390add0c
...@@ -179,8 +179,8 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf) ...@@ -179,8 +179,8 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf)
if (!jbd2_journal_has_csum_v2or3(j)) if (!jbd2_journal_has_csum_v2or3(j))
return 1; return 1;
tail = (struct jbd2_journal_block_tail *)(buf + j->j_blocksize - tail = (struct jbd2_journal_block_tail *)((char *)buf +
sizeof(struct jbd2_journal_block_tail)); j->j_blocksize - sizeof(struct jbd2_journal_block_tail));
provided = tail->t_checksum; provided = tail->t_checksum;
tail->t_checksum = 0; tail->t_checksum = 0;
calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize); calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize);
...@@ -896,7 +896,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, ...@@ -896,7 +896,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,
{ {
jbd2_journal_revoke_header_t *header; jbd2_journal_revoke_header_t *header;
int offset, max; int offset, max;
int csum_size = 0; unsigned csum_size = 0;
__u32 rcount; __u32 rcount;
int record_len = 4; int record_len = 4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment