diff -uNr -Xdontdiff -p linux-2.4.20-pre4/include/linux/pagemap.h linux/include/linux/pagemap.h --- linux-2.4.20-pre4/include/linux/pagemap.h Tue Aug 6 11:27:18 2002 +++ linux/include/linux/pagemap.h Sun Aug 25 19:32:11 2002 @@ -97,7 +97,15 @@ static inline void wait_on_page(struct p ___wait_on_page(page); } -extern struct page * grab_cache_page (struct address_space *, unsigned long); +/* + * Returns locked page at given index in given cache, creating it if needed. + */ +static inline struct page *grab_cache_page(struct address_space *mapping, unsigned long index) +{ + return find_or_create_page(mapping, index, mapping->gfp_mask); +} + + extern struct page * grab_cache_page_nowait (struct address_space *, unsigned long); typedef int filler_t(void *, struct page*); diff -uNr -Xdontdiff -p linux-2.4.20-pre4/kernel/ksyms.c linux/kernel/ksyms.c --- linux-2.4.20-pre4/kernel/ksyms.c Tue Aug 13 15:56:05 2002 +++ linux/kernel/ksyms.c Sun Aug 25 19:32:04 2002 @@ -261,7 +262,7 @@ EXPORT_SYMBOL(poll_freewait); EXPORT_SYMBOL(ROOT_DEV); EXPORT_SYMBOL(__find_get_page); EXPORT_SYMBOL(__find_lock_page); -EXPORT_SYMBOL(grab_cache_page); +EXPORT_SYMBOL(find_or_create_page); EXPORT_SYMBOL(grab_cache_page_nowait); EXPORT_SYMBOL(read_cache_page); EXPORT_SYMBOL(set_page_dirty); diff -uNr -Xdontdiff -p linux-2.4.20-pre4/mm/filemap.c linux/mm/filemap.c --- linux-2.4.20-pre4/mm/filemap.c Tue Aug 20 11:37:00 2002 +++ linux/mm/filemap.c Tue Aug 20 11:39:48 2002 @@ -1029,15 +1029,6 @@ struct page * find_or_create_page(struct } /* - * Returns locked page at given index in given cache, creating it if needed. - */ -struct page *grab_cache_page(struct address_space *mapping, unsigned long index) -{ - return find_or_create_page(mapping, index, mapping->gfp_mask); -} - - -/* * Same as grab_cache_page, but do not wait if the page is unavailable. * This is intended for speculative data generators, where the data can * be regenerated if the page couldn't be grabbed. This routine should