|
@@ -2002,12 +2002,12 @@ r5l_recovery_verify_data_checksum_for_mb(struct r5l_log *log,
|
|
payload = (void *)mb + mb_offset;
|
|
payload = (void *)mb + mb_offset;
|
|
payload_flush = (void *)mb + mb_offset;
|
|
payload_flush = (void *)mb + mb_offset;
|
|
|
|
|
|
- if (payload->header.type == R5LOG_PAYLOAD_DATA) {
|
|
|
|
|
|
+ if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_DATA) {
|
|
if (r5l_recovery_verify_data_checksum(
|
|
if (r5l_recovery_verify_data_checksum(
|
|
log, ctx, page, log_offset,
|
|
log, ctx, page, log_offset,
|
|
payload->checksum[0]) < 0)
|
|
payload->checksum[0]) < 0)
|
|
goto mismatch;
|
|
goto mismatch;
|
|
- } else if (payload->header.type == R5LOG_PAYLOAD_PARITY) {
|
|
|
|
|
|
+ } else if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_PARITY) {
|
|
if (r5l_recovery_verify_data_checksum(
|
|
if (r5l_recovery_verify_data_checksum(
|
|
log, ctx, page, log_offset,
|
|
log, ctx, page, log_offset,
|
|
payload->checksum[0]) < 0)
|
|
payload->checksum[0]) < 0)
|
|
@@ -2019,12 +2019,12 @@ r5l_recovery_verify_data_checksum_for_mb(struct r5l_log *log,
|
|
BLOCK_SECTORS),
|
|
BLOCK_SECTORS),
|
|
payload->checksum[1]) < 0)
|
|
payload->checksum[1]) < 0)
|
|
goto mismatch;
|
|
goto mismatch;
|
|
- } else if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
|
|
|
|
|
|
+ } else if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_FLUSH) {
|
|
/* nothing to do for R5LOG_PAYLOAD_FLUSH here */
|
|
/* nothing to do for R5LOG_PAYLOAD_FLUSH here */
|
|
} else /* not R5LOG_PAYLOAD_DATA/PARITY/FLUSH */
|
|
} else /* not R5LOG_PAYLOAD_DATA/PARITY/FLUSH */
|
|
goto mismatch;
|
|
goto mismatch;
|
|
|
|
|
|
- if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
|
|
|
|
|
|
+ if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_FLUSH) {
|
|
mb_offset += sizeof(struct r5l_payload_flush) +
|
|
mb_offset += sizeof(struct r5l_payload_flush) +
|
|
le32_to_cpu(payload_flush->size);
|
|
le32_to_cpu(payload_flush->size);
|
|
} else {
|
|
} else {
|
|
@@ -2091,7 +2091,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
|
|
payload = (void *)mb + mb_offset;
|
|
payload = (void *)mb + mb_offset;
|
|
payload_flush = (void *)mb + mb_offset;
|
|
payload_flush = (void *)mb + mb_offset;
|
|
|
|
|
|
- if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
|
|
|
|
|
|
+ if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_FLUSH) {
|
|
int i, count;
|
|
int i, count;
|
|
|
|
|
|
count = le32_to_cpu(payload_flush->size) / sizeof(__le64);
|
|
count = le32_to_cpu(payload_flush->size) / sizeof(__le64);
|
|
@@ -2113,7 +2113,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
|
|
}
|
|
}
|
|
|
|
|
|
/* DATA or PARITY payload */
|
|
/* DATA or PARITY payload */
|
|
- stripe_sect = (payload->header.type == R5LOG_PAYLOAD_DATA) ?
|
|
|
|
|
|
+ stripe_sect = (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_DATA) ?
|
|
raid5_compute_sector(
|
|
raid5_compute_sector(
|
|
conf, le64_to_cpu(payload->location), 0, &dd,
|
|
conf, le64_to_cpu(payload->location), 0, &dd,
|
|
NULL)
|
|
NULL)
|
|
@@ -2151,7 +2151,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
|
|
list_add_tail(&sh->lru, cached_stripe_list);
|
|
list_add_tail(&sh->lru, cached_stripe_list);
|
|
}
|
|
}
|
|
|
|
|
|
- if (payload->header.type == R5LOG_PAYLOAD_DATA) {
|
|
|
|
|
|
+ if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_DATA) {
|
|
if (!test_bit(STRIPE_R5C_CACHING, &sh->state) &&
|
|
if (!test_bit(STRIPE_R5C_CACHING, &sh->state) &&
|
|
test_bit(R5_Wantwrite, &sh->dev[sh->pd_idx].flags)) {
|
|
test_bit(R5_Wantwrite, &sh->dev[sh->pd_idx].flags)) {
|
|
r5l_recovery_replay_one_stripe(conf, sh, ctx);
|
|
r5l_recovery_replay_one_stripe(conf, sh, ctx);
|
|
@@ -2159,7 +2159,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
|
|
}
|
|
}
|
|
r5l_recovery_load_data(log, sh, ctx, payload,
|
|
r5l_recovery_load_data(log, sh, ctx, payload,
|
|
log_offset);
|
|
log_offset);
|
|
- } else if (payload->header.type == R5LOG_PAYLOAD_PARITY)
|
|
|
|
|
|
+ } else if (le16_to_cpu(payload->header.type) == R5LOG_PAYLOAD_PARITY)
|
|
r5l_recovery_load_parity(log, sh, ctx, payload,
|
|
r5l_recovery_load_parity(log, sh, ctx, payload,
|
|
log_offset);
|
|
log_offset);
|
|
else
|
|
else
|
|
@@ -2361,7 +2361,7 @@ r5c_recovery_rewrite_data_only_stripes(struct r5l_log *log,
|
|
payload = (void *)mb + offset;
|
|
payload = (void *)mb + offset;
|
|
payload->header.type = cpu_to_le16(
|
|
payload->header.type = cpu_to_le16(
|
|
R5LOG_PAYLOAD_DATA);
|
|
R5LOG_PAYLOAD_DATA);
|
|
- payload->size = BLOCK_SECTORS;
|
|
|
|
|
|
+ payload->size = cpu_to_le32(BLOCK_SECTORS);
|
|
payload->location = cpu_to_le64(
|
|
payload->location = cpu_to_le64(
|
|
raid5_compute_blocknr(sh, i, 0));
|
|
raid5_compute_blocknr(sh, i, 0));
|
|
addr = kmap_atomic(dev->page);
|
|
addr = kmap_atomic(dev->page);
|