X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fmpage.c;h=f1d2d02bd4c81ebeb0ccde0c2d66d6c4a980d3d3;hb=6ff730c33b42a6c68217fc6660728676aa8eeb9c;hp=bb9aebe93862d8c03a94990d4b28fc4832e93a1f;hpb=a7df849c67f0a5248693e432d03f738e84d6826c;p=linux-2.6-omap-h63xx.git

diff --git a/fs/mpage.c b/fs/mpage.c
index bb9aebe9386..f1d2d02bd4c 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -102,7 +102,7 @@ static struct bio *mpage_bio_submit(int rw, struct bio *bio)
 static struct bio *
 mpage_alloc(struct block_device *bdev,
 		sector_t first_sector, int nr_vecs,
-		unsigned int __nocast gfp_flags)
+		gfp_t gfp_flags)
 {
 	struct bio *bio;
 
@@ -721,7 +721,7 @@ retry:
 						&last_block_in_bio, &ret, wbc,
 						page->mapping->a_ops->writepage);
 			}
-			if (unlikely(ret == WRITEPAGE_ACTIVATE))
+			if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE))
 				unlock_page(page);
 			if (ret || (--(wbc->nr_to_write) <= 0))
 				done = 1;