Skip to content

Commit

Permalink
memremap: simplify duplicate region handling in devm_memremap_pages
Browse files Browse the repository at this point in the history
__radix_tree_insert already checks for duplicates and returns -EEXIST in
that case, so remove the duplicate (and racy) duplicates check.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Christoph Hellwig authored and Dan Williams committed Jan 8, 2018
1 parent 0628b8c commit 7003e3b
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions kernel/memremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,6 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
align_end = align_start + align_size - 1;

foreach_order_pgoff(res, order, pgoff) {
struct dev_pagemap *dup;

rcu_read_lock();
dup = find_dev_pagemap(res->start + PFN_PHYS(pgoff));
rcu_read_unlock();
if (dup) {
dev_err(dev, "%s: %pr collides with mapping for %s\n",
__func__, res, dev_name(dup->dev));
error = -EBUSY;
break;
}
error = __radix_tree_insert(&pgmap_radix,
PHYS_PFN(res->start) + pgoff, order, page_map);
if (error) {
Expand Down

0 comments on commit 7003e3b

Please sign in to comment.