Commit 6daa0e28 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: mm/* (easy parts) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af4ca457

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ extern unsigned long do_mremap(unsigned long addr, 
 * The callback will be passed nr_to_scan == 0 when the VM is querying the

 * cache size, so a fastpath for that case is appropriate.

 */

typedef int (*shrinker_t)(int nr_to_scan, unsigned int gfp_mask);

typedef int (*shrinker_t)(int nr_to_scan, gfp_t gfp_mask);



/*

 * Add an aging callback.  The int is the number of 'seeks' it takes

include/linux/pagemap.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ extern struct page * find_lock_page(struct address_space *mapping, 
extern struct page * find_trylock_page(struct address_space *mapping,

				unsigned long index);

extern struct page * find_or_create_page(struct address_space *mapping,

				unsigned long index, unsigned int gfp_mask);

				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_tag(struct address_space *mapping, pgoff_t *index,
@@ -92,9 +92,9 @@ extern int read_cache_pages(struct address_space *mapping, 
		struct list_head *pages, filler_t *filler, void *data);



int add_to_page_cache(struct page *page, struct address_space *mapping,

				unsigned long index, int gfp_mask);

				unsigned long index, gfp_t gfp_mask);

int add_to_page_cache_lru(struct page *page, struct address_space *mapping,

				unsigned long index, int gfp_mask);

				unsigned long index, gfp_t gfp_mask);

extern void remove_from_page_cache(struct page *page);

extern void __remove_from_page_cache(struct page *page);

include/linux/slab.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ extern unsigned int ksize(const void *); 
extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node);

extern void *kmalloc_node(size_t size, gfp_t flags, int node);

#else

static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node)

static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node)

{

	return kmem_cache_alloc(cachep, flags);

}

include/linux/swap.h

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ extern int rotate_reclaimable_page(struct page *page); 
extern void swap_setup(void);



/* linux/mm/vmscan.c */

extern int try_to_free_pages(struct zone **, unsigned int);

extern int zone_reclaim(struct zone *, unsigned int, unsigned int);

extern int try_to_free_pages(struct zone **, gfp_t);

extern int zone_reclaim(struct zone *, gfp_t, unsigned int);

extern int shrink_all_memory(int);

extern int vm_swappiness;

mm/filemap.c

+4 −4
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ int filemap_write_and_wait_range(struct address_space *mapping, 
 * This function does not add the page to the LRU.  The caller must do that.

 */

int add_to_page_cache(struct page *page, struct address_space *mapping,

		pgoff_t offset, int gfp_mask)

		pgoff_t offset, gfp_t gfp_mask)

{

	int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
@@ -401,7 +401,7 @@ int add_to_page_cache(struct page *page, struct address_space *mapping, 
EXPORT_SYMBOL(add_to_page_cache);



int add_to_page_cache_lru(struct page *page, struct address_space *mapping,

				pgoff_t offset, int gfp_mask)

				pgoff_t offset, gfp_t gfp_mask)

{

	int ret = add_to_page_cache(page, mapping, offset, gfp_mask);

	if (ret == 0)
@@ -591,7 +591,7 @@ EXPORT_SYMBOL(find_lock_page); 
 * memory exhaustion.

 */

struct page *find_or_create_page(struct address_space *mapping,

		unsigned long index, unsigned int gfp_mask)

		unsigned long index, gfp_t gfp_mask)

{

	struct page *page, *cached_page = NULL;

	int err;
@@ -683,7 +683,7 @@ struct page * 
grab_cache_page_nowait(struct address_space *mapping, unsigned long index)

{

	struct page *page = find_get_page(mapping, index);

	unsigned int gfp_mask;

	gfp_t gfp_mask;



	if (page) {

		if (!TestSetPageLocked(page))