diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 16:27:21 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 16:31:35 -0400 |
| commit | 1471308fb5ec4335f9ae9fc65f65048dbe7c336e (patch) | |
| tree | 69aef90f47105e1c730e5277f352d3d5446a1174 /mm/memory-failure.c | |
| parent | 4c07ae0ad493b7b2d3dd3e53870e594f136ce8a5 (diff) | |
| parent | 76cffccd606acffde1b91e8b029b39b5fd1a3117 (diff) | |
Merge remote-tracking branch 'jens/for-5.10/block' into dm-5.10
DM depends on these block 5.10 commits:
22ada802ede8 block: use lcm_not_zero() when stacking chunk_sectors
07d098e6bbad block: allow 'chunk_sectors' to be non-power-of-2
021a24460dc2 block: add QUEUE_FLAG_NOWAIT
6abc49468eea dm: add support for REQ_NOWAIT and enable it for linear target
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index f1aa6433f404..a1e73943445e 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1006,7 +1006,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, */ mapping = page_mapping(hpage); if (!(flags & MF_MUST_KILL) && !PageDirty(hpage) && mapping && - mapping_cap_writeback_dirty(mapping)) { + mapping_can_writeback(mapping)) { if (page_mkclean(hpage)) { SetPageDirty(hpage); } else { |