Matthew Wilcox <wi...@infradead.org> writes:
> On Fri, Jun 22, 2018 at 11:51:33AM +0800, Huang, Ying wrote:
>> +++ b/mm/swap_state.c
>> @@ -433,7 +433,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry,
>> gfp_t gfp_mask,
>> /*
>> * Swap entry may have been freed since our caller observed it.
>> */
>> - err = swapcache_prepare(entry);
>> + err = swapcache_prepare(entry, false);
>> if (err == -EEXIST) {
>> radix_tree_preload_end();
>> /*
>
> This commit should be just a textual conflict.
Yes. Will check it.
Best Regards,
Huang, Ying
