undo __find_pagecache_page braindamage in -rmap15
Subsystems (4)
PATCH 1/1 undo __find_pagecache_page braindamage in -rmap15
Just revert back to the mainline versions of that stuff (which are the same except of the naming).
Note that the changes are not only useless but also unintuitive, the old name explained exactly what this function does, and the pagecache is superflous as all find_*_page functions operate on the pagecache..
Changelog.rmap +2 -1
@@ -12,9 +12,10 @@ - backport speedups from 2.5 - pte-highmem + - undo __find_pagecache_page braindamage (Christoph Hellwig) rmap 15a: - more agressive freeing for higher order allocations (me) - - export __find_pagecache_page, find_get_page define (me, Cristoph, Arjan) + - export __find_pagecache_page, find_get_page define (me, Christoph, Arjan) - make memory statistics SMP safe again (me) - make page aging slow down again when needed (Andrew Morton) - first stab at fine-tuning arjan's O(1) VM (me)
===== include/linux/pagemap.h 1.20 vs edited =====
include/linux/pagemap.h +4 -8
@@ -70,6 +70,10 @@#define page_hash (mapping,index) (page_hash_table+_page_hashfn(mapping,index)) +extern struct page *__find_get_page (struct address_space *mapping, +unsigned long index,struct page **hash); +#define find_get_page (mapping, index) \ + __find_get_page(mapping, index, page_hash(mapping, index))extern struct page *__find_lock_page (struct address_space * mapping,unsigned long index,struct page **hash); extern struct page * find_or_create_page(struct address_space *mapping,
@@ -87,14 +91,6 @@extern void ___wait_on_page (struct page *);extern int wait_on_page_timeout (struct page *page,int timeout); - - -extern struct page *__find_pagecache_page (struct address_space *mapping, -unsigned long index,struct page **hash); -#define find_pagecache_page (mapping, index) \ - __find_pagecache_page(mapping, index, page_hash(mapping, index)) -#define find_get_page (mapping, index) \ - __find_pagecache_page(mapping, index, page_hash(mapping, index))static inline void wait_on_page (struct page * page) {
===== kernel/ksyms.c 1.65 vs edited =====
kernel/ksyms.c +1 -0
@@ -260,6 +260,7 @@EXPORT_SYMBOL (__pollwait);EXPORT_SYMBOL (poll_freewait);EXPORT_SYMBOL (ROOT_DEV ); +EXPORT_SYMBOL (__find_get_page);EXPORT_SYMBOL (__find_lock_page);EXPORT_SYMBOL (find_or_create_page);EXPORT_SYMBOL (grab_cache_page_nowait);
===== mm/filemap.c 1.78 vs edited =====
mm/filemap.c +24 -26
80 lines not on this page · raw message
===== mm/shmem.c 1.46 vs edited =====
mm/shmem.c +1 -1
@@ -547,7 +547,7 @@* cache and swap cache. We need to recheck the page cache * under the protection of the info->lock spinlock. */ - page =find_pagecache_page (mapping, idx); + page =find_get_page (mapping, idx);if (page) {if (TryLockPage (page)) goto wait_retry;
===== mm/swap_state.c 1.20 vs edited =====
mm/swap_state.c +3 -3
@@ -196,7 +196,7 @@ {struct page *found; - found =find_pagecache_page (&swapper_space, entry.val); + found =find_get_page (&swapper_space, entry.val);/* * Unsafe to assert PageSwapCache and mapping on page found: * if SMP nothing prevents swapoff from deleting this page from
@@ -224,10 +224,10 @@/* * First check the swap cache. Since this is normally * called after lookup_swap_cache() failed, re-calling -* that would confuse statistics: use find_pagecache_page() +* that would confuse statistics: use find_get_page() * directly. */ - found_page =find_pagecache_page (&swapper_space, entry.val); + found_page =find_get_page (&swapper_space, entry.val);if (found_page)break ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/