The quilt patch titled Subject: mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages-fix has been removed from the -mm tree. Its filename was mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages-fix.patch This patch was dropped because it was folded into mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages.patch ------------------------------------------------------ From: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Subject: mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages-fix Date: Fri, 1 Nov 2024 09:56:29 +0800 code layout cleaup, per dhowells Link: https://lkml.kernel.org/r/32dd938c-3531-49f7-93e4-b7ff21fec569@xxxxxxxxxxxxxxxxx Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Suggested-by: David Howells <dhowells@xxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Yang Shi <shy828301@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/shmem.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/mm/shmem.c~mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages-fix +++ a/mm/shmem.c @@ -3332,12 +3332,11 @@ static ssize_t shmem_file_splice_read(st * Fallback to PAGE_SIZE splice if the large folio has hwpoisoned * pages. */ - if (likely(!fallback_page_splice)) { - size = len; - } else { + size = len; + if (unlikely(fallback_page_splice)) { size_t offset = *ppos & ~PAGE_MASK; - size = min_t(loff_t, PAGE_SIZE - offset, len); + size = umin(size, PAGE_SIZE - offset); } part = min_t(loff_t, isize - *ppos, size); _ Patches currently in -mm which might be from baolin.wang@xxxxxxxxxxxxxxxxx are mm-shmem-fix-khugepaged-activation-policy-for-shmem.patch mm-shmem-update-iocb-ki_pos-directly-to-simplify-tmpfs-read-logic.patch mm-shmem-improve-the-tmpfs-large-folio-read-performance.patch mm-shmem-fallback-to-page-size-splice-if-large-folio-has-poisoned-pages.patch