diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-23 20:23:01 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-10-01 00:34:47 +0200 |
| commit | 7cd8558baa4e4588a80ecb31cb30784195763cdd (patch) | |
| tree | f6c9e24be9fbd339bab3bae92b5b7749d28a1636 /fs/f2fs/recovery.c | |
| parent | f2fs: refactor flush_nat_entries to remove costly reorganizing ops (diff) | |
| download | linux-7cd8558baa4e4588a80ecb31cb30784195763cdd.tar.xz linux-7cd8558baa4e4588a80ecb31cb30784195763cdd.zip | |
f2fs: check the use of macros on block counts and addresses
This patch cleans up the existing and new macros for readability.
Rule is like this.
,-----------------------------------------> MAX_BLKADDR -,
| ,------------- TOTAL_BLKS ----------------------------,
| | |
| ,- seg0_blkaddr ,----- sit/nat/ssa/main blkaddress |
block | | (SEG0_BLKADDR) | | | | (e.g., MAIN_BLKADDR) |
address 0..x................ a b c d .............................
| |
global seg# 0...................... m .............................
| | |
| `------- MAIN_SEGS -----------'
`-------------- TOTAL_SEGS ---------------------------'
| |
seg# 0..........xx..................
= Note =
o GET_SEGNO_FROM_SEG0 : blk address -> global segno
o GET_SEGNO : blk address -> segno
o START_BLOCK : segno -> starting block address
Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/recovery.c')
| -rw-r--r-- | fs/f2fs/recovery.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index 947b92273d08..ebd013225788 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -173,8 +173,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) while (1) { struct fsync_inode_entry *entry; - if (blkaddr < SM_I(sbi)->main_blkaddr || - blkaddr >= (SM_I(sbi)->seg0_blkaddr + TOTAL_BLKS(sbi))) + if (blkaddr < MAIN_BLKADDR(sbi) || blkaddr >= MAX_BLKADDR(sbi)) return 0; page = get_meta_page_ra(sbi, blkaddr); @@ -434,8 +433,7 @@ static int recover_data(struct f2fs_sb_info *sbi, while (1) { struct fsync_inode_entry *entry; - if (blkaddr < SM_I(sbi)->main_blkaddr || - blkaddr >= (SM_I(sbi)->seg0_blkaddr + TOTAL_BLKS(sbi))) + if (blkaddr < MAIN_BLKADDR(sbi) || blkaddr >= MAX_BLKADDR(sbi)) break; page = get_meta_page_ra(sbi, blkaddr); @@ -525,7 +523,7 @@ out: /* truncate meta pages to be used by the recovery */ truncate_inode_pages_range(META_MAPPING(sbi), - SM_I(sbi)->main_blkaddr << PAGE_CACHE_SHIFT, -1); + MAIN_BLKADDR(sbi) << PAGE_CACHE_SHIFT, -1); if (err) { truncate_inode_pages_final(NODE_MAPPING(sbi)); |