diff options
| author | Hugh Dickins <hughd@google.com> | 2018-11-30 23:10:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-30 23:56:15 +0100 |
| commit | 95feeabb77149f7d48f05bde61d75621c57db67e (patch) | |
| tree | feb93071531a60ec390ac4b18d37cf2c1358b68b /fs/ocfs2/export.c | |
| parent | mm/khugepaged: collapse_shmem() do not crash on Compound (diff) | |
| download | linux-95feeabb77149f7d48f05bde61d75621c57db67e.tar.xz linux-95feeabb77149f7d48f05bde61d75621c57db67e.zip | |
mm/khugepaged: fix the xas_create_range() error path
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>
Diffstat (limited to 'fs/ocfs2/export.c')
0 files changed, 0 insertions, 0 deletions