The patch titled Subject: mm/highmem: remove unnecessary done label has been added to the -mm tree. Its filename is mm-highmem-remove-unnecessary-done-label.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-highmem-remove-unnecessary-done-label.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-highmem-remove-unnecessary-done-label.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm/highmem: remove unnecessary done label Remove unnecessary done label to simplify the code. Link: https://lkml.kernel.org/r/20220126092542.64659-1-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx> Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/highmem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/mm/highmem.c~mm-highmem-remove-unnecessary-done-label +++ a/mm/highmem.c @@ -736,11 +736,11 @@ void *page_address(const struct page *pa list_for_each_entry(pam, &pas->lh, list) { if (pam->page == page) { ret = pam->virtual; - goto done; + break; } } } -done: + spin_unlock_irqrestore(&pas->lock, flags); return ret; } @@ -773,13 +773,12 @@ void set_page_address(struct page *page, list_for_each_entry(pam, &pas->lh, list) { if (pam->page == page) { list_del(&pam->list); - spin_unlock_irqrestore(&pas->lock, flags); - goto done; + break; } } spin_unlock_irqrestore(&pas->lock, flags); } -done: + return; } _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-memremap-avoid-calling-kasan_remove_zero_shadow-for-device-private-memory.patch mm-vmalloc-remove-unneeded-function-forward-declaration.patch mm-balloon_compaction-make-balloon-page-compaction-callbacks-static.patch mm-highmem-remove-unnecessary-done-label.patch mm-hmmc-remove-unneeded-local-variable-ret.patch