| Message ID | 20171215140947.26075-18-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/17] memremap: provide stubs for vmem_altmap_offset and vmem_altmap_free | expand |
On Fri, Dec 15, 2017 at 6:09 AM, Christoph Hellwig <hch@lst.de> wrote: > There is only one caller of the trivial function find_dev_pagemap left, > so just merge it into the caller. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good, Reviewed-by: Dan Williams <dan.j.williams@intel.com> ...and all of these pass the nvdimm unit tests, so I think we're good to go. I'll rebase the filesystem-DAX vs DMA collision series on top of this.
diff --git a/kernel/memremap.c b/kernel/memremap.c index fd0e7c44e6bd..c04000361664 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -306,14 +306,6 @@ static void devm_memremap_pages_release(void *data) "%s: failed to free all reserved pages\n", __func__); } -/* assumes rcu_read_lock() held at entry */ -static struct dev_pagemap *find_dev_pagemap(resource_size_t phys) -{ - WARN_ON_ONCE(!rcu_read_lock_held()); - - return radix_tree_lookup(&pgmap_radix, PHYS_PFN(phys)); -} - /** * devm_memremap_pages - remap and provide memmap backing for the given resource * @dev: hosting device for @res @@ -466,7 +458,7 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, /* fall back to slow path lookup */ rcu_read_lock(); - pgmap = find_dev_pagemap(phys); + pgmap = radix_tree_lookup(&pgmap_radix, PHYS_PFN(phys)); if (pgmap && !percpu_ref_tryget_live(pgmap->ref)) pgmap = NULL; rcu_read_unlock();
There is only one caller of the trivial function find_dev_pagemap left, so just merge it into the caller. Signed-off-by: Christoph Hellwig <hch@lst.de> --- kernel/memremap.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)