https://github.com/torvalds/linux
Revision 95feeabb77149f7d48f05bde61d75621c57db67e authored by Hugh Dickins on 30 November 2018, 22:10:50 UTC, committed by Linus Torvalds on 30 November 2018, 22:56:15 UTC
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.

Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1811261531200.2275@eggly.anvils
Fixes: 77da9389b9d5 ("mm: Convert collapse_shmem to XArray")
Signed-off-by: Hugh Dickins <hughd@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 06a5e12
History
Tip revision: 95feeabb77149f7d48f05bde61d75621c57db67e authored by Hugh Dickins on 30 November 2018, 22:10:50 UTC
mm/khugepaged: fix the xas_create_range() error path
Tip revision: 95feeab
File Mode Size
Makefile -rw-r--r-- 361 bytes
compat.c -rw-r--r-- 2.2 KB
ipc_sysctl.c -rw-r--r-- 5.9 KB
mq_sysctl.c -rw-r--r-- 2.9 KB
mqueue.c -rw-r--r-- 39.0 KB
msg.c -rw-r--r-- 29.9 KB
msgutil.c -rw-r--r-- 3.6 KB
namespace.c -rw-r--r-- 4.6 KB
sem.c -rw-r--r-- 61.4 KB
shm.c -rw-r--r-- 42.4 KB
syscall.c -rw-r--r-- 4.7 KB
util.c -rw-r--r-- 22.1 KB
util.h -rw-r--r-- 9.0 KB

back to top