aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/feature-removal-schedule.txt12
-rw-r--r--include/linux/pagemap.h2
-rw-r--r--mm/filemap.c20
3 files changed, 0 insertions, 34 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2dc5e5da8f88..4a1d8979ed92 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -186,18 +186,6 @@ Who: Greg Kroah-Hartman <gregkh@suse.de>
186 186
187--------------------------- 187---------------------------
188 188
189What: find_trylock_page
190When: January 2007
191Why: The interface no longer has any callers left in the kernel. It
192 is an odd interface (compared with other find_*_page functions), in
193 that it does not take a refcount to the page, only the page lock.
194 It should be replaced with find_get_page or find_lock_page if possible.
195 This feature removal can be reevaluated if users of the interface
196 cannot cleanly use something else.
197Who: Nick Piggin <npiggin@suse.de>
198
199---------------------------
200
201What: Interrupt only SA_* flags 189What: Interrupt only SA_* flags
202When: Januar 2007 190When: Januar 2007
203Why: The interrupt related SA_* flags are replaced by IRQF_* to move them 191Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index c3e255bf8594..7a8dcb82a699 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -76,8 +76,6 @@ extern struct page * find_get_page(struct address_space *mapping,
76 unsigned long index); 76 unsigned long index);
77extern struct page * find_lock_page(struct address_space *mapping, 77extern struct page * find_lock_page(struct address_space *mapping,
78 unsigned long index); 78 unsigned long index);
79extern __deprecated_for_modules struct page * find_trylock_page(
80 struct address_space *mapping, unsigned long index);
81extern struct page * find_or_create_page(struct address_space *mapping, 79extern struct page * find_or_create_page(struct address_space *mapping,
82 unsigned long index, gfp_t gfp_mask); 80 unsigned long index, gfp_t gfp_mask);
83unsigned find_get_pages(struct address_space *mapping, pgoff_t start, 81unsigned find_get_pages(struct address_space *mapping, pgoff_t start,
diff --git a/mm/filemap.c b/mm/filemap.c
index 8332c77b1bd1..f30ef28405d3 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -606,26 +606,6 @@ struct page * find_get_page(struct address_space *mapping, unsigned long offset)
606EXPORT_SYMBOL(find_get_page); 606EXPORT_SYMBOL(find_get_page);
607 607
608/** 608/**
609 * find_trylock_page - find and lock a page
610 * @mapping: the address_space to search
611 * @offset: the page index
612 *
613 * Same as find_get_page(), but trylock it instead of incrementing the count.
614 */
615struct page *find_trylock_page(struct address_space *mapping, unsigned long offset)
616{
617 struct page *page;
618
619 read_lock_irq(&mapping->tree_lock);
620 page = radix_tree_lookup(&mapping->page_tree, offset);
621 if (page && TestSetPageLocked(page))
622 page = NULL;
623 read_unlock_irq(&mapping->tree_lock);
624 return page;
625}
626EXPORT_SYMBOL(find_trylock_page);
627
628/**
629 * find_lock_page - locate, pin and lock a pagecache page 609 * find_lock_page - locate, pin and lock a pagecache page
630 * @mapping: the address_space to search 610 * @mapping: the address_space to search
631 * @offset: the page index 611 * @offset: the page index