diff options
| author | Chao Yu <chao2.yu@samsung.com> | 2016-03-11 16:43:54 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-03-14 09:26:53 -0700 |
| commit | f102ca4c3f421e04397ab2fab443ca43b86da385 (patch) | |
| tree | cfe8d3d74586aa230967e09a06be1eb845894d4b /fsck/f2fs.h | |
| parent | 9b09631c8f82b4687c179a6a4b86a4e6c5b4df75 (diff) | |
| download | f2fs-tools-f102ca4c3f421e04397ab2fab443ca43b86da385.tar.gz | |
f2fs-tools: rebase struct f2fs_summary_block with upstream
Struct f2fs_summary_block has been changed in upstream commits:
- commit 8f1dbbbbdfe9 ("f2fs: introduce lifetime write IO statistics")
- commit dfc08a12e49a ("f2fs: introduce f2fs_journal struct to wrap journal info")
This patch does the sync work for f2fs_summary_block structure between
f2fs-utils and f2fs kernel module.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fsck/f2fs.h')
| -rw-r--r-- | fsck/f2fs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fsck/f2fs.h b/fsck/f2fs.h index f990527..a618b47 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -314,13 +314,13 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type) } -#define nats_in_cursum(sum) (le16_to_cpu(sum->n_nats)) -#define sits_in_cursum(sum) (le16_to_cpu(sum->n_sits)) +#define nats_in_cursum(jnl) (le16_to_cpu(jnl->n_nats)) +#define sits_in_cursum(jnl) (le16_to_cpu(jnl->n_sits)) -#define nat_in_journal(sum, i) (sum->nat_j.entries[i].ne) -#define nid_in_journal(sum, i) (sum->nat_j.entries[i].nid) -#define sit_in_journal(sum, i) (sum->sit_j.entries[i].se) -#define segno_in_journal(sum, i) (sum->sit_j.entries[i].segno) +#define nat_in_journal(jnl, i) (jnl->nat_j.entries[i].ne) +#define nid_in_journal(jnl, i) (jnl->nat_j.entries[i].nid) +#define sit_in_journal(jnl, i) (jnl->sit_j.entries[i].se) +#define segno_in_journal(jnl, i) (jnl->sit_j.entries[i].segno) #define SIT_ENTRY_OFFSET(sit_i, segno) \ (segno % sit_i->sents_per_block) |