Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd936f84 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: cleanup write_orphan_inodes 



Previously, since 'commit 4531929e ("f2fs: move grabing orphan
pages out of protection region")' was committed, in write_orphan_inodes(),
we will grab all meta page in a batch before we use them under spinlock,
so that we can avoid large time delay of grabbing meta pages under
spinlock.

Now, 'commit d6c67a4f ("f2fs: revmove spin_lock for
write_orphan_inodes")' remove the spinlock in write_orphan_inodes,
so there is no issue we describe above, we'd better recover to move
the grab operation to original place for readability.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 5b339124

fs/f2fs/checkpoint.c

+2 −9
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) 
	struct list_head *head;

	struct f2fs_orphan_block *orphan_blk = NULL;

	unsigned int nentries = 0;

	unsigned short index;

	unsigned short index = 1;

	unsigned short orphan_blocks;

	struct page *page = NULL;

	struct ino_entry *orphan = NULL;
@@ -512,11 +512,6 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) 


	orphan_blocks = GET_ORPHAN_BLOCKS(im->ino_num);



	for (index = 0; index < orphan_blocks; index++)

		grab_meta_page(sbi, start_blk + index);



	index = 1;



	/*

	 * we don't need to do spin_lock(&im->ino_lock) here, since all the

	 * orphan inode operations are covered under f2fs_lock_op().
@@ -527,12 +522,10 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) 
	/* loop for each orphan inode entry and write them in Jornal block */

	list_for_each_entry(orphan, head, list) {

		if (!page) {

			page = find_get_page(META_MAPPING(sbi), start_blk++);

			f2fs_bug_on(sbi, !page);

			page = grab_meta_page(sbi, start_blk++);

			orphan_blk =

				(struct f2fs_orphan_block *)page_address(page);

			memset(orphan_blk, 0, sizeof(*orphan_blk));

			f2fs_put_page(page, 0);

		}



		orphan_blk->ino[nentries++] = cpu_to_le32(orphan->ino);