aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:24:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:24:20 -0700
commit7c1c3eb855b5311118bed3b51c79d652d40148ec (patch)
treec1964e8d08318ccaaba8882d5eb38778311d7ead /include
parent[PATCH] x86/PAE: Fix pte_clear for the >4GB RAM case (diff)
parent[PATCH] splice: make the read-side do batched page lookups (diff)
downloadlinux-dev-7c1c3eb855b5311118bed3b51c79d652d40148ec.tar.xz
linux-dev-7c1c3eb855b5311118bed3b51c79d652d40148ec.zip
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: make the read-side do batched page lookups [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages() [PATCH] splice: switch to using page_cache_readahead()
Diffstat (limited to 'include')
-rw-r--r--include/linux/pagemap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 9539efd4f7e6..7a1af574dedf 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -78,6 +78,8 @@ extern struct page * find_or_create_page(struct address_space *mapping,
unsigned long index, gfp_t gfp_mask);
unsigned find_get_pages(struct address_space *mapping, pgoff_t start,
unsigned int nr_pages, struct page **pages);
+unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t start,
+ unsigned int nr_pages, struct page **pages);
unsigned find_get_pages_tag(struct address_space *mapping, pgoff_t *index,
int tag, unsigned int nr_pages, struct page **pages);