| Message ID | 20241216155408.8102-1-willy@infradead.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] dax: Remove access to page->index | expand |
On 12/16/2024 7:53 AM, Matthew Wilcox (Oracle) wrote: > This looks like a complete mess (why are we setting page->index at page > fault time?), but I no longer care about DAX, and there's no reason to > let DAX hold us back from removing page->index. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > drivers/dax/device.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/dax/device.c b/drivers/dax/device.c > index 6d74e62bbee0..bc871a34b9cd 100644 > --- a/drivers/dax/device.c > +++ b/drivers/dax/device.c > @@ -89,14 +89,13 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn, > ALIGN_DOWN(vmf->address, fault_size)); > > for (i = 0; i < nr_pages; i++) { > - struct page *page = pfn_to_page(pfn_t_to_pfn(pfn) + i); > + struct folio *folio = pfn_folio(pfn_t_to_pfn(pfn) + i); > > - page = compound_head(page); > - if (page->mapping) > + if (folio->mapping) > continue; > > - page->mapping = filp->f_mapping; > - page->index = pgoff + i; > + folio->mapping = filp->f_mapping; > + folio->index = pgoff + i; > } > } > Looks good. Reviewed-by: Jane Chu <jane.chu@oracle.com> -jane
diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 6d74e62bbee0..bc871a34b9cd 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -89,14 +89,13 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn, ALIGN_DOWN(vmf->address, fault_size)); for (i = 0; i < nr_pages; i++) { - struct page *page = pfn_to_page(pfn_t_to_pfn(pfn) + i); + struct folio *folio = pfn_folio(pfn_t_to_pfn(pfn) + i); - page = compound_head(page); - if (page->mapping) + if (folio->mapping) continue; - page->mapping = filp->f_mapping; - page->index = pgoff + i; + folio->mapping = filp->f_mapping; + folio->index = pgoff + i; } }
This looks like a complete mess (why are we setting page->index at page fault time?), but I no longer care about DAX, and there's no reason to let DAX hold us back from removing page->index. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- drivers/dax/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)