f2fs: simplify write_orphan_inodes for better readable
Subsystems (2)
PATCH 4/5 f2fs: simplify write_orphan_inodes for better readable
Simplify write_orphan_inodes for better readable. Because we hold the orphan_inode_mutex, so it's safe to use list_for_each_entry instead of list_for_each_safe.
Signed-off-by Gu Zheng <[email protected]>
--- fs/f2fs/checkpoint.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-)
fs/f2fs/checkpoint.c +18 -20
@@ -300,12 +300,13 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi)static void write_orphan_inodes (struct f2fs_sb_info *sbi,block_t start_blk) { -struct list_head *head, *this, *next; +struct list_head *head;struct f2fs_orphan_block *orphan_blk =NULL ;struct page *page =NULL ;unsigned int nentries =0 ;unsigned short index =1 ;unsigned short orphan_blocks; +struct orphan_inode_entry *orphan =NULL ; orphan_blocks = (unsigned short )((sbi->n_orphans + (F2FS_ORPHANS_PER_BLOCK -1 )) /F2FS_ORPHANS_PER_BLOCK );
@@ -314,12 +315,17 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) head = &sbi->orphan_inode_list;/* loop for each orphan inode entry and write them in Jornal block */ -list_for_each_safe (this, next, head) { -struct orphan_inode_entry *orphan; +list_for_each_entry (orphan, head, list) { +if (!page) { + page =grab_meta_page (sbi, start_blk); + orphan_blk = + (struct f2fs_orphan_block *)page_address (page); +memset (orphan_blk,0 ,sizeof (*orphan_blk)); + } - orphan = list_entry(this, struct orphan_inode_entry, list); + orphan_blk->ino[nentries] =cpu_to_le32 (orphan->ino); -if (nentries ==F2FS_ORPHANS_PER_BLOCK ) { +if (nentries++ ==F2FS_ORPHANS_PER_BLOCK ) {/* * an orphan block is full of 1020 entries, * then we need to flush current orphan blocks
@@ -335,24 +341,16 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) nentries =0 ; page =NULL ; } -if (page) - goto page_exist; + } - page =grab_meta_page (sbi, start_blk); - orphan_blk = (struct f2fs_orphan_block *)page_address (page); -memset (orphan_blk,0 ,sizeof (*orphan_blk)); -page_exist: - orphan_blk->ino[nentries++] =cpu_to_le32 (orphan->ino); +if (page) { + orphan_blk->blk_addr =cpu_to_le16 (index); + orphan_blk->blk_count =cpu_to_le16 (orphan_blocks); + orphan_blk->entry_count =cpu_to_le32 (nentries); +set_page_dirty (page); +f2fs_put_page (page,1 ); } -if (!page) - goto end; - orphan_blk->blk_addr =cpu_to_le16 (index); - orphan_blk->blk_count =cpu_to_le16 (orphan_blocks); - orphan_blk->entry_count =cpu_to_le32 (nentries); -set_page_dirty (page); -f2fs_put_page (page,1 ); -end:mutex_unlock (&sbi->orphan_inode_mutex); }
Signature · 9 lines
1.7.7 ------------------------------------------------------------------------------ Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk