From 63cfe75e0c489ce98c8f428f5b4aa4ec02f715b0 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 6 Dec 2006 20:33:15 -0800 Subject: [PATCH] --- yaml --- r: 42691 b: refs/heads/master c: f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 h: refs/heads/master i: 42689: d4ec4881a72ce98bb23e0929ebafc0de8aa9f0f9 42687: bd81a692034f82601dc8e5d19769cbe3fe10b381 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/crypto.c | 4 ++-- trunk/fs/ecryptfs/inode.c | 2 +- trunk/include/linux/slab.h | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c8b37a12f823..7d68c3d99752 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6b4f8da3a88457148038bc952043e99a7fdba64 +refs/heads/master: f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 diff --git a/trunk/fs/ecryptfs/crypto.c b/trunk/fs/ecryptfs/crypto.c index f63a7755fe86..776b2eed371e 100644 --- a/trunk/fs/ecryptfs/crypto.c +++ b/trunk/fs/ecryptfs/crypto.c @@ -1334,7 +1334,7 @@ int ecryptfs_write_headers(struct dentry *ecryptfs_dentry, goto out; } /* Released in this function */ - page_virt = kmem_cache_alloc(ecryptfs_header_cache_0, SLAB_USER); + page_virt = kmem_cache_alloc(ecryptfs_header_cache_0, GFP_USER); if (!page_virt) { ecryptfs_printk(KERN_ERR, "Out of memory\n"); rc = -ENOMEM; @@ -1493,7 +1493,7 @@ int ecryptfs_read_headers(struct dentry *ecryptfs_dentry, &ecryptfs_inode_to_private(ecryptfs_dentry->d_inode)->crypt_stat; /* Read the first page from the underlying file */ - page_virt = kmem_cache_alloc(ecryptfs_header_cache_1, SLAB_USER); + page_virt = kmem_cache_alloc(ecryptfs_header_cache_1, GFP_USER); if (!page_virt) { rc = -ENOMEM; ecryptfs_printk(KERN_ERR, "Unable to allocate page_virt\n"); diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c index dfcc68484f47..70911412044d 100644 --- a/trunk/fs/ecryptfs/inode.c +++ b/trunk/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, diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 5b70d52b4f86..d7ee28e51330 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -20,7 +20,6 @@ typedef struct kmem_cache kmem_cache_t; /* flags for kmem_cache_alloc() */ #define SLAB_ATOMIC GFP_ATOMIC -#define SLAB_USER GFP_USER #define SLAB_KERNEL GFP_KERNEL #define SLAB_DMA GFP_DMA