diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /fs/jfs | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/jfs_metapage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 13d7e3f1feb4..eeb37d70e650 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c | |||
| @@ -198,7 +198,7 @@ static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags) | |||
| 198 | } | 198 | } |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | static inline struct metapage *alloc_metapage(unsigned int gfp_mask) | 201 | static inline struct metapage *alloc_metapage(gfp_t gfp_mask) |
| 202 | { | 202 | { |
| 203 | return mempool_alloc(metapage_mempool, gfp_mask); | 203 | return mempool_alloc(metapage_mempool, gfp_mask); |
| 204 | } | 204 | } |
| @@ -534,7 +534,7 @@ add_failed: | |||
| 534 | return -EIO; | 534 | return -EIO; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | static int metapage_releasepage(struct page *page, int gfp_mask) | 537 | static int metapage_releasepage(struct page *page, gfp_t gfp_mask) |
| 538 | { | 538 | { |
| 539 | struct metapage *mp; | 539 | struct metapage *mp; |
| 540 | int busy = 0; | 540 | int busy = 0; |