[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>
This commit is contained in:
parent
e6b4f8da3a
commit
f7267c0c07
@ -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");
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user