f2fs: add BUG_ON to avoid unnecessary flow (ff373558) · Commits · 戴 / test

This patch adds BUG_ON instead of retrying loop. In the case of node pages, we already got this inode page, but unlocked it. By the fact that we don't truncate any node pages in operations, the page's mapping should be unchangeable. Signed-off-by:

Jaegeuk Kim <jaegeuk@kernel.org>

fs/f2fs/node.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -832,7 +832,7 @@ int truncate_inode_blocks(struct inode *inode, pgoff_t from)
		trace_f2fs_truncate_inode_blocks_enter(inode, from);

		level = get_node_path(inode, from, offset, noffset);
		restart:

		page = get_node_page(sbi, inode->i_ino);
		if (IS_ERR(page)) {
		trace_f2fs_truncate_inode_blocks_exit(inode, PTR_ERR(page));
		@@ -896,10 +896,7 @@ skip_partial:
		if (offset[1] == 0 &&
		ri->i_nid[offset[0] - NODE_DIR1_BLOCK]) {
		lock_page(page);
		if (unlikely(page->mapping != NODE_MAPPING(sbi))) {
		f2fs_put_page(page, 1);
		goto restart;
		}
		BUG_ON(page->mapping != NODE_MAPPING(sbi));
		f2fs_wait_on_page_writeback(page, NODE, true);
		ri->i_nid[offset[0] - NODE_DIR1_BLOCK] = 0;
		set_page_dirty(page);

Admin message