From: Christoph Lameter <clameter@sgi.com>
To: akpm@osdl.org
Cc: linux-mm@kvack.org, Christoph Lameter <clameter@sgi.com>,
Pekka Enberg <penberg@cs.helsinki.fi>
Subject: [PATCH 5/8] Get rid of SLAB_USER
Date: Tue, 28 Nov 2006 16:44:52 -0800 (PST) [thread overview]
Message-ID: <20061129004452.11682.33585.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20061129004426.11682.36688.sendpatchset@schroedinger.engr.sgi.com>
Get rid of SLAB_USER
SLAB_USER is an alias of GFP_USER
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.19-rc6-mm1/fs/ecryptfs/crypto.c
===================================================================
--- linux-2.6.19-rc6-mm1.orig/fs/ecryptfs/crypto.c 2006-11-28 16:02:29.000000000 -0800
+++ linux-2.6.19-rc6-mm1/fs/ecryptfs/crypto.c 2006-11-28 16:08:59.000000000 -0800
@@ -1333,7 +1333,7 @@
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;
@@ -1492,7 +1492,7 @@
&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");
Index: linux-2.6.19-rc6-mm1/fs/ecryptfs/inode.c
===================================================================
--- linux-2.6.19-rc6-mm1.orig/fs/ecryptfs/inode.c 2006-11-28 16:02:29.000000000 -0800
+++ linux-2.6.19-rc6-mm1/fs/ecryptfs/inode.c 2006-11-28 16:08:59.000000000 -0800
@@ -363,7 +363,7 @@
/* 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,
Index: linux-2.6.19-rc6-mm1/include/linux/slab.h
===================================================================
--- linux-2.6.19-rc6-mm1.orig/include/linux/slab.h 2006-11-28 16:08:50.000000000 -0800
+++ linux-2.6.19-rc6-mm1/include/linux/slab.h 2006-11-28 16:09:09.000000000 -0800
@@ -18,7 +18,6 @@
/* 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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2006-11-29 0:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-29 0:44 [PATCH 0/8] Slab: Remove GFP_XX aliases from slab.h Christoph Lameter
2006-11-29 0:44 ` [PATCH 1/8] Get rid of SLAB_NO_GROW Christoph Lameter
2006-11-29 0:44 ` [PATCH 2/8] Get rid of SLAB_LEVEL_MASK Christoph Lameter
2006-11-29 0:44 ` [PATCH 3/8] Get rid of SLAB_NOIO Christoph Lameter
2006-11-29 0:44 ` [PATCH 4/8] Get rid of SLAB_NOFS Christoph Lameter
2006-11-29 0:44 ` Christoph Lameter [this message]
2006-11-29 0:44 ` [PATCH 6/8] Get rid of SLAB_ATOMIC Christoph Lameter
2006-11-29 0:45 ` [PATCH 7/8] Get rid of SLAB_KERNEL Christoph Lameter
2006-11-29 0:45 ` [PATCH 8/8] Get rid of SLAB_DMA Christoph Lameter
2006-11-29 7:07 ` [PATCH 0/8] Slab: Remove GFP_XX aliases from slab.h Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061129004452.11682.33585.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=akpm@osdl.org \
--cc=linux-mm@kvack.org \
--cc=penberg@cs.helsinki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox