diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /fs/nfs/pagelist.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'fs/nfs/pagelist.c')
| -rw-r--r-- | fs/nfs/pagelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index bc9fab68b29c..ca4b1d4ff42b 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
| @@ -21,13 +21,13 @@ | |||
| 21 | 21 | ||
| 22 | #define NFS_PARANOIA 1 | 22 | #define NFS_PARANOIA 1 |
| 23 | 23 | ||
| 24 | static kmem_cache_t *nfs_page_cachep; | 24 | static struct kmem_cache *nfs_page_cachep; |
| 25 | 25 | ||
| 26 | static inline struct nfs_page * | 26 | static inline struct nfs_page * |
| 27 | nfs_page_alloc(void) | 27 | nfs_page_alloc(void) |
| 28 | { | 28 | { |
| 29 | struct nfs_page *p; | 29 | struct nfs_page *p; |
| 30 | p = kmem_cache_alloc(nfs_page_cachep, SLAB_KERNEL); | 30 | p = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL); |
| 31 | if (p) { | 31 | if (p) { |
| 32 | memset(p, 0, sizeof(*p)); | 32 | memset(p, 0, sizeof(*p)); |
| 33 | INIT_LIST_HEAD(&p->wb_list); | 33 | INIT_LIST_HEAD(&p->wb_list); |