diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-02-03 17:36:16 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-03 17:36:16 -0800 |
| commit | c59400a68c53374179cdc5f99fa77afbd092dcf8 (patch) | |
| tree | c5e17286fa5b7867a5290a975cca3bc5759d510e /mm/memory-failure.c | |
| parent | 9c30918925d7992a6d812b3aa7e026839723c78a (diff) | |
| parent | dcb85f85fa6f142aae1fe86f399d4503d49f2b60 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 14ae5c18e776..97a9ed8f87a9 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1596,6 +1596,12 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, } /* + * Pages instantiated by device-dax (not filesystem-dax) + * may be compound pages. + */ + page = compound_head(page); + + /* * Prevent the inode from being freed while we are interrogating * the address_space, typically this would be handled by * lock_page(), but dax pages do not use the page lock. This |