From: Christoph Hellwig Signed-off-by: Christoph Hellwig Cc: David Howells Signed-off-by: Andrew Morton --- fs/cachefiles/cf-interface.c | 8 ++++---- include/linux/fscache-cache.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff -puN fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-fscache-fix-gfp_t-sparse-annotations fs/cachefiles/cf-interface.c --- a/fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-fscache-fix-gfp_t-sparse-annotations +++ a/fs/cachefiles/cf-interface.c @@ -671,7 +671,7 @@ static int cachefiles_read_or_alloc_page struct page *page, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp) + gfp_t gfp) { struct cachefiles_object *object; struct cachefiles_cache *cache; @@ -983,7 +983,7 @@ static int cachefiles_read_or_alloc_page unsigned *nr_pages, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp) + gfp_t gfp) { struct cachefiles_object *object; struct cachefiles_cache *cache; @@ -1100,7 +1100,7 @@ static int cachefiles_read_or_alloc_page */ static int cachefiles_allocate_page(struct fscache_object *_object, struct page *page, - unsigned long gfp) + gfp_t gfp) { struct cachefiles_object *object; struct cachefiles_cache *cache; @@ -1195,7 +1195,7 @@ static int cachefiles_write_page(struct struct page *page, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp) + gfp_t gfp) { // struct cachefiles_one_write *writer; struct cachefiles_object *object; diff -puN include/linux/fscache-cache.h~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-fscache-fix-gfp_t-sparse-annotations include/linux/fscache-cache.h --- a/include/linux/fscache-cache.h~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-fscache-fix-gfp_t-sparse-annotations +++ a/include/linux/fscache-cache.h @@ -116,7 +116,7 @@ struct fscache_cache_ops { struct page *page, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp); + gfp_t gfp); /* request backing blocks for a list of pages be read or allocated in * the cache */ @@ -126,27 +126,27 @@ struct fscache_cache_ops { unsigned *nr_pages, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp); + gfp_t gfp); /* request a backing block for a page be allocated in the cache so that * it can be written directly */ int (*allocate_page)(struct fscache_object *object, struct page *page, - unsigned long gfp); + gfp_t gfp); /* write a page to its backing block in the cache */ int (*write_page)(struct fscache_object *object, struct page *page, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp); + gfp_t gfp); /* write several pages to their backing blocks in the cache */ int (*write_pages)(struct fscache_object *object, struct pagevec *pagevec, fscache_rw_complete_t end_io_func, void *context, - unsigned long gfp); + gfp_t gfp); /* detach backing block from a bunch of pages */ void (*uncache_pages)(struct fscache_object *object, _