From: Johann Lombardi <johann.lombardi@bull.net>
To: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: ext4 development <linux-ext4@vger.kernel.org>
Subject: Re: ext4 kernel patches against linux-2.6.18-rc7-mm1
Date: Thu, 21 Sep 2006 17:15:23 +0200 [thread overview]
Message-ID: <20060921151523.GA20682@lombardij> (raw)
In-Reply-To: <1158767799.9276.23.camel@kleikamp.austin.ibm.com>
On Wed, Sep 20, 2006 at 10:56:39AM -0500, Dave Kleikamp wrote:
> # These next 4 copy clone jdb2 from jbd and modify ext4 to use it
> jbd2-copy.patch
> jbd2-rename.patch
jbd and jbd2 currently use the same slab names which must be unique.
The patch below just renames jbd2's slabs.
Signed-off-by: Johann Lombardi <johann.lombardi@bull.net>
Index: linux-2.6.18-rc7-mm1/fs/jbd2/journal.c
===================================================================
--- linux-2.6.18-rc7-mm1.orig/fs/jbd2/journal.c 2006-09-21 16:37:49.566959224 +0200
+++ linux-2.6.18-rc7-mm1/fs/jbd2/journal.c 2006-09-21 16:38:19.145462608 +0200
@@ -1643,7 +1643,7 @@
static kmem_cache_t *jbd_slab[JBD_MAX_SLABS];
static const char *jbd_slab_names[JBD_MAX_SLABS] = {
- "jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k"
+ "jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
};
static void jbd2_journal_destroy_jbd_slabs(void)
@@ -1714,7 +1714,7 @@
int retval;
J_ASSERT(jbd2_journal_head_cache == 0);
- jbd2_journal_head_cache = kmem_cache_create("journal_head",
+ jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head",
sizeof(struct journal_head),
0, /* offset */
0, /* flags */
@@ -2019,7 +2019,7 @@
static int __init journal_init_handle_cache(void)
{
- jbd2_handle_cache = kmem_cache_create("journal_handle",
+ jbd2_handle_cache = kmem_cache_create("jbd2_journal_handle",
sizeof(handle_t),
0, /* offset */
0, /* flags */
Index: linux-2.6.18-rc7-mm1/fs/jbd2/revoke.c
===================================================================
--- linux-2.6.18-rc7-mm1.orig/fs/jbd2/revoke.c 2006-09-21 16:38:28.044109808 +0200
+++ linux-2.6.18-rc7-mm1/fs/jbd2/revoke.c 2006-09-21 16:38:40.978143536 +0200
@@ -169,13 +169,13 @@
int __init jbd2_journal_init_revoke_caches(void)
{
- jbd2_revoke_record_cache = kmem_cache_create("revoke_record",
+ jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
sizeof(struct jbd2_revoke_record_s),
0, SLAB_HWCACHE_ALIGN, NULL, NULL);
if (jbd2_revoke_record_cache == 0)
return -ENOMEM;
- jbd2_revoke_table_cache = kmem_cache_create("revoke_table",
+ jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
sizeof(struct jbd2_revoke_table_s),
0, 0, NULL, NULL);
if (jbd2_revoke_table_cache == 0) {
next prev parent reply other threads:[~2006-09-21 15:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-20 15:56 ext4 kernel patches against linux-2.6.18-rc7-mm1 Dave Kleikamp
2006-09-20 16:32 ` Eric Sandeen
2006-09-20 17:38 ` Eric Sandeen
2006-09-21 15:15 ` Johann Lombardi [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-09-26 16:43 Alexandre Ratchov
2006-09-26 16:55 ` Alexandre Ratchov
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=20060921151523.GA20682@lombardij \
--to=johann.lombardi@bull.net \
--cc=linux-ext4@vger.kernel.org \
--cc=shaggy@austin.ibm.com \
/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