On Mon, Nov 26, 2018 at 03:33:13PM -0800, Hugh Dickins wrote: > collapse_shmem()'s xas_nomem() is very unlikely to fail, but it is > rightly given a failure path, so move the whole xas_create_range() block > up before __SetPageLocked(new_page): so that it does not need to remember > to unlock_page(new_page). Add the missing mem_cgroup_cancel_charge(), > and set (currently unused) result to SCAN_FAIL rather than SCAN_SUCCEED. > > Fixes: 77da9389b9d5 ("mm: Convert collapse_shmem to XArray") > Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx> > Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> > Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> -- Kirill A. Shutemov