From: Christoph Hellwig Subject: [PATCH 1/2] fscache: fix gfp_t sparse annotations Date: Thu, 28 Sep 2006 17:45:51 +0100 Message-ID: <20060928164551.GD3497@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org Return-path: Received: from pentafluge.infradead.org ([213.146.154.40]:38828 "EHLO pentafluge.infradead.org") by vger.kernel.org with ESMTP id S1751930AbWI1QqY (ORCPT ); Thu, 28 Sep 2006 12:46:24 -0400 To: dhowells@redhat.com, akpm@osdl.org, gregkh@suse.de Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Christoph Hellwig Index: linux-2.6/include/linux/fscache-cache.h =================================================================== --- linux-2.6.orig/include/linux/fscache-cache.h 2006-09-28 16:32:12.000000000 +0200 +++ linux-2.6/include/linux/fscache-cache.h 2006-09-28 16:46:59.000000000 +0200 @@ -116,7 +116,7 @@ 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 @@ 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, Index: linux-2.6/fs/cachefiles/cf-interface.c =================================================================== --- linux-2.6.orig/fs/cachefiles/cf-interface.c 2006-09-28 16:32:12.000000000 +0200 +++ linux-2.6/fs/cachefiles/cf-interface.c 2006-09-28 16:49:52.000000000 +0200 @@ -692,7 +692,7 @@ 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; @@ -1006,7 +1006,7 @@ 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; @@ -1125,7 +1125,7 @@ */ 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; @@ -1220,7 +1220,7 @@ 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;