mm/page_io.c: remove useless out label in __swap_writepage() (548d9782) · Commits · 戴 / test

The out label is only used in one place and return ret directly without something like resource cleanup or lock release and so on. So we should remove this jump label and do some cleanup. Signed-off-by:

Miaohe Lin <linmiaohe@huawei.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Andrew Morton <akpm@linux-foundation.org> Link: https://lkml.kernel.org/r/20200927124032.22521-1-linmiaohe@huawei.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/page_io.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -359,13 +359,11 @@ int __swap_writepage(struct page page, struct writeback_control wbc,
		return 0;
		}

		ret = 0;
		bio = get_swap_bio(GFP_NOIO, page, end_write_func);
		if (bio == NULL) {
		set_page_dirty(page);
		unlock_page(page);
		ret = -ENOMEM;
		goto out;
		return -ENOMEM;
		}
		bio->bi_opf = REQ_OP_WRITE \| REQ_SWAP \| wbc_to_write_flags(wbc);
		bio_associate_blkg_from_page(bio, page);
		@@ -373,8 +371,8 @@ int __swap_writepage(struct page page, struct writeback_control wbc,
		set_page_writeback(page);
		unlock_page(page);
		submit_bio(bio);
		out:
		return ret;

		return 0;
		}

		int swap_readpage(struct page *page, bool synchronous)

Admin message