#member, le64_to_cpu((ptr)->member), le64_to_cpu((ptr)->member) ); \
} while (0);
-#define segno_in_journal(sum, i) (sum->sit_j.entries[i].segno)
+#define segno_in_journal(jnl, i) (jnl->sit_j.entries[i].segno)
-#define sit_in_journal(sum, i) (sum->sit_j.entries[i].se)
+#define sit_in_journal(jnl, i) (jnl->sit_j.entries[i].se)
static void dbg_print_raw_sb_info(struct f2fs_super_block *sb)
{
SLOGD("blocks_per_sit: %"PRIu64, info->blocks_per_sit);
SLOGD("sit_blocks loc: %p", info->sit_blocks);
SLOGD("sit_sums loc: %p", info->sit_sums);
- SLOGD("sit_sums num: %d", le16_to_cpu(info->sit_sums->n_sits));
+ SLOGD("sit_sums num: %d", le16_to_cpu(info->journal->n_sits));
unsigned int i;
- for(i = 0; i < (le16_to_cpu(info->sit_sums->n_sits)); i++) {
- SLOGD("entry %d in journal entries is for segment %d",i, le32_to_cpu(segno_in_journal(info->sit_sums, i)));
+ for(i = 0; i < (le16_to_cpu(info->journal->n_sits)); i++) {
+ SLOGD("entry %d in journal entries is for segment %d",i, le32_to_cpu(segno_in_journal(info->journal, i)));
}
SLOGD("cp_blkaddr: %"PRIu64, info->cp_blkaddr);
if (is_set_ckpt_flags(cp, CP_COMPACT_SUM_FLAG)) {
if (read_structure_blk(fd, info->cp_valid_cp_blkaddr + le32_to_cpu(cp->cp_pack_start_sum), buffer, 1))
return -1;
- memcpy(&info->sit_sums->n_sits, &buffer[SUM_JOURNAL_SIZE], SUM_JOURNAL_SIZE);
+ memcpy(&info->sit_sums->journal.n_sits, &buffer[SUM_JOURNAL_SIZE], SUM_JOURNAL_SIZE);
} else {
u64 blk_addr;
if (is_set_ckpt_flags(cp, CP_UMOUNT_FLAG))
/* check the SIT entries in the journal */
found = 0;
- for(i = 0; i < le16_to_cpu(info->sit_sums->n_sits); i++) {
- if (le32_to_cpu(segno_in_journal(info->sit_sums, i)) == segnum) {
- sit_entry = &sit_in_journal(info->sit_sums, i);
+ for(i = 0; i < le16_to_cpu(info->journal->n_sits); i++) {
+ if (le32_to_cpu(segno_in_journal(info->journal, i)) == segnum) {
+ sit_entry = &sit_in_journal(info->journal, i);
found = 1;
break;
}