summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-07-25 01:46:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:32 -0700
commit1984bb763c2e50d0ebfb0cf56d1b319bd7afe63a (patch)
treedde3d0c06ee054d2d4439e6ac16da831f83a72a7 /fs
parentf4d79ca2fa211cffc07306eeed7013448e77d7ec (diff)
downloadlinux-3.10-1984bb763c2e50d0ebfb0cf56d1b319bd7afe63a.tar.gz
linux-3.10-1984bb763c2e50d0ebfb0cf56d1b319bd7afe63a.tar.bz2
linux-3.10-1984bb763c2e50d0ebfb0cf56d1b319bd7afe63a.zip
jbd: tidy up revoke cache initialisation and destruction
Make revocation cache destruction safe to call if initialisation fails partially or entirely. This allows it to be used to cleanup in the case of initialisation failure, simplifying that code slightly. Signed-off-by: Duane Griffin <duaneg@dghda.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/jbd/revoke.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 8ff5a7b89b9..c7bd649bbbd 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -166,33 +166,43 @@ static struct jbd_revoke_record_s *find_revoke_record(journal_t *journal,
return NULL;
}
+void journal_destroy_revoke_caches(void)
+{
+ if (revoke_record_cache) {
+ kmem_cache_destroy(revoke_record_cache);
+ revoke_record_cache = NULL;
+ }
+ if (revoke_table_cache) {
+ kmem_cache_destroy(revoke_table_cache);
+ revoke_table_cache = NULL;
+ }
+}
+
int __init journal_init_revoke_caches(void)
{
+ J_ASSERT(!revoke_record_cache);
+ J_ASSERT(!revoke_table_cache);
+
revoke_record_cache = kmem_cache_create("revoke_record",
sizeof(struct jbd_revoke_record_s),
0,
SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY,
NULL);
if (!revoke_record_cache)
- return -ENOMEM;
+ goto record_cache_failure;
revoke_table_cache = kmem_cache_create("revoke_table",
sizeof(struct jbd_revoke_table_s),
0, SLAB_TEMPORARY, NULL);
- if (!revoke_table_cache) {
- kmem_cache_destroy(revoke_record_cache);
- revoke_record_cache = NULL;
- return -ENOMEM;
- }
+ if (!revoke_table_cache)
+ goto table_cache_failure;
+
return 0;
-}
-void journal_destroy_revoke_caches(void)
-{
- kmem_cache_destroy(revoke_record_cache);
- revoke_record_cache = NULL;
- kmem_cache_destroy(revoke_table_cache);
- revoke_table_cache = NULL;
+table_cache_failure:
+ journal_destroy_revoke_caches();
+record_cache_failure:
+ return -ENOMEM;
}
static struct jbd_revoke_table_s *journal_init_revoke_table(int hash_size)