On 08/30/2018 09:20 AM, Matthew Wilcox wrote:
>
> This patch got caught in the crossfire and didn't make it into 4.18
> as planned. Can it make 4.19 please?
>
> ---- >8 ----
>
> Use my_zero_pfn instead of ZERO_PAGE, and pass the vaddr to it so it
> works on MIPS and s390.
>
> Signed-off-by: Matthew Wilcox <[email protected]>
> Reviewed-by: Ross Zwisler <[email protected]>
Applied
> ---
> fs/dax.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/fs/dax.c b/fs/dax.c
> index 467601a134bc..c7917b46a75b 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -1093,21 +1093,12 @@ static vm_fault_t dax_load_hole(struct address_space
> *mapping, void *entry,
> {
> struct inode *inode = mapping->host;
> unsigned long vaddr = vmf->address;
> - vm_fault_t ret = VM_FAULT_NOPAGE;
> - struct page *zero_page;
> - pfn_t pfn;
> -
> - zero_page = ZERO_PAGE(0);
> - if (unlikely(!zero_page)) {
> - ret = VM_FAULT_OOM;
> - goto out;
> - }
> + pfn_t pfn = pfn_to_pfn_t(my_zero_pfn(vaddr));
> + vm_fault_t ret;
>
> - pfn = page_to_pfn_t(zero_page);
> dax_insert_mapping_entry(mapping, vmf, entry, pfn, RADIX_DAX_ZERO_PAGE,
> false);
> ret = vmf_insert_mixed(vmf->vma, vaddr, pfn);
> -out:
> trace_dax_load_hole(inode, vmf, ret);
> return ret;
> }
>
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
