summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/inode.c
diff options
context:
space:
mode:
authorChristoph Lameter2006-12-07 05:33:15 +0100
committerLinus Torvalds2006-12-07 17:39:24 +0100
commitf7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (patch)
tree4bbc467e881f9dce909de3d9d9d27bb068a8a3b4 /fs/ecryptfs/inode.c
parent[PATCH] slab: remove SLAB_NOFS (diff)
downloadkernel-qcow2-linux-f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6.tar.gz
kernel-qcow2-linux-f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6.tar.xz
kernel-qcow2-linux-f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6.zip
[PATCH] slab: remove SLAB_USER
SLAB_USER is an alias of GFP_USER 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/ecryptfs/inode.c')
-rw-r--r--fs/ecryptfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index dfcc68484f47..70911412044d 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -404,7 +404,7 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
/* Released in this function */
page_virt =
(char *)kmem_cache_alloc(ecryptfs_header_cache_2,
- SLAB_USER);
+ GFP_USER);
if (!page_virt) {
rc = -ENOMEM;
ecryptfs_printk(KERN_ERR,