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

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

f2fs: introduce scan_curseg_cache for cleanup 



Commit 4ac91242 ("f2fs: introduce free nid bitmap") copied codes
from __build_free_nids() into scan_free_nid_bits(), they are redundant,
introduce one common function scan_curseg_cache for cleanup.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6180b68c

fs/f2fs/node.c

+23 −26
Original line number Diff line number Diff line
@@ -1949,11 +1949,30 @@ static void scan_nat_page(struct f2fs_sb_info *sbi, 
	}

}



static void scan_free_nid_bits(struct f2fs_sb_info *sbi)

static void scan_curseg_cache(struct f2fs_sb_info *sbi)

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);

	struct f2fs_journal *journal = curseg->journal;

	int i;



	down_read(&curseg->journal_rwsem);

	for (i = 0; i < nats_in_cursum(journal); i++) {

		block_t addr;

		nid_t nid;



		addr = le32_to_cpu(nat_in_journal(journal, i).block_addr);

		nid = le32_to_cpu(nid_in_journal(journal, i));

		if (addr == NULL_ADDR)

			add_free_nid(sbi, nid, true);

		else

			remove_free_nid(sbi, nid);

	}

	up_read(&curseg->journal_rwsem);

}



static void scan_free_nid_bits(struct f2fs_sb_info *sbi)

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	unsigned int i, idx;

	nid_t nid;
@@ -1978,26 +1997,14 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) 
		}

	}

out:

	down_read(&curseg->journal_rwsem);

	for (i = 0; i < nats_in_cursum(journal); i++) {

		block_t addr;

	scan_curseg_cache(sbi);



		addr = le32_to_cpu(nat_in_journal(journal, i).block_addr);

		nid = le32_to_cpu(nid_in_journal(journal, i));

		if (addr == NULL_ADDR)

			add_free_nid(sbi, nid, true);

		else

			remove_free_nid(sbi, nid);

	}

	up_read(&curseg->journal_rwsem);

	up_read(&nm_i->nat_tree_lock);

}



static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount)

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);

	struct f2fs_journal *journal = curseg->journal;

	int i = 0;

	nid_t nid = nm_i->next_scan_nid;
@@ -2043,18 +2050,8 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) 
	nm_i->next_scan_nid = nid;



	/* find free nids from current sum_pages */

	down_read(&curseg->journal_rwsem);

	for (i = 0; i < nats_in_cursum(journal); i++) {

		block_t addr;

	scan_curseg_cache(sbi);



		addr = le32_to_cpu(nat_in_journal(journal, i).block_addr);

		nid = le32_to_cpu(nid_in_journal(journal, i));

		if (addr == NULL_ADDR)

			add_free_nid(sbi, nid, true);

		else

			remove_free_nid(sbi, nid);

	}

	up_read(&curseg->journal_rwsem);

	up_read(&nm_i->nat_tree_lock);



	ra_meta_pages(sbi, NAT_BLOCK_OFFSET(nm_i->next_scan_nid),