diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /fs/nfs | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/direct.c | 2 | ||||
-rw-r--r-- | fs/nfs/inode.c | 2 | ||||
-rw-r--r-- | fs/nfs/pagelist.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index bdfabf854a51..769fd0a0c772 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -143,7 +143,7 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void) | |||
143 | { | 143 | { |
144 | struct nfs_direct_req *dreq; | 144 | struct nfs_direct_req *dreq; |
145 | 145 | ||
146 | dreq = kmem_cache_alloc(nfs_direct_cachep, SLAB_KERNEL); | 146 | dreq = kmem_cache_alloc(nfs_direct_cachep, GFP_KERNEL); |
147 | if (!dreq) | 147 | if (!dreq) |
148 | return NULL; | 148 | return NULL; |
149 | 149 | ||
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 08cc4c5919ab..6b53aae4ed2c 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1080,7 +1080,7 @@ void nfs4_clear_inode(struct inode *inode) | |||
1080 | struct inode *nfs_alloc_inode(struct super_block *sb) | 1080 | struct inode *nfs_alloc_inode(struct super_block *sb) |
1081 | { | 1081 | { |
1082 | struct nfs_inode *nfsi; | 1082 | struct nfs_inode *nfsi; |
1083 | nfsi = (struct nfs_inode *)kmem_cache_alloc(nfs_inode_cachep, SLAB_KERNEL); | 1083 | nfsi = (struct nfs_inode *)kmem_cache_alloc(nfs_inode_cachep, GFP_KERNEL); |
1084 | if (!nfsi) | 1084 | if (!nfsi) |
1085 | return NULL; | 1085 | return NULL; |
1086 | nfsi->flags = 0UL; | 1086 | nfsi->flags = 0UL; |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 829af323f288..a1561a820abe 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -26,7 +26,7 @@ static inline struct nfs_page * | |||
26 | nfs_page_alloc(void) | 26 | nfs_page_alloc(void) |
27 | { | 27 | { |
28 | struct nfs_page *p; | 28 | struct nfs_page *p; |
29 | p = kmem_cache_alloc(nfs_page_cachep, SLAB_KERNEL); | 29 | p = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL); |
30 | if (p) { | 30 | if (p) { |
31 | memset(p, 0, sizeof(*p)); | 31 | memset(p, 0, sizeof(*p)); |
32 | INIT_LIST_HEAD(&p->wb_list); | 32 | INIT_LIST_HEAD(&p->wb_list); |