Skip to contentSkip to conversation

fscache: fix gfp_t sparse annotations

PATCH New Christoph Hellwig 1 participant 1 message Sep 28, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 fscache: fix gfp_t sparse annotations

include/linux/fscache-cache.h +5 -5
Index: linux-2.6/include/linux/fscache-cache.h
===================================================================
@@ -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,
fs/cachefiles/cf-interface.c +4 -4
Index: linux-2.6/fs/cachefiles/cf-interface.c
===================================================================
@@ -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;