X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjbd%2Frevoke.c;h=1bb43e987f4b4ff4f0e37a2d578d34c1642cf6c0;hb=18c6ac383f3e46cfce08d0bf972705852a4e1268;hp=62e13c8db132b5efc4ec24adcfb3837204cf0014;hpb=d638d4990bfb99998420e78e8fd4607bca5cf8d0;p=linux-2.6

diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 62e13c8db1..1bb43e987f 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -138,7 +138,7 @@ repeat:
 oom:
 	if (!journal_oom_retry)
 		return -ENOMEM;
-	jbd_debug(1, "ENOMEM in %s, retrying\n", __FUNCTION__);
+	jbd_debug(1, "ENOMEM in %s, retrying\n", __func__);
 	yield();
 	goto repeat;
 }
@@ -170,14 +170,16 @@ int __init journal_init_revoke_caches(void)
 {
 	revoke_record_cache = kmem_cache_create("revoke_record",
 					   sizeof(struct jbd_revoke_record_s),
-					   0, SLAB_HWCACHE_ALIGN, NULL);
-	if (revoke_record_cache == 0)
+					   0,
+					   SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY,
+					   NULL);
+	if (!revoke_record_cache)
 		return -ENOMEM;
 
 	revoke_table_cache = kmem_cache_create("revoke_table",
 					   sizeof(struct jbd_revoke_table_s),
-					   0, 0, NULL);
-	if (revoke_table_cache == 0) {
+					   0, SLAB_TEMPORARY, NULL);
+	if (!revoke_table_cache) {
 		kmem_cache_destroy(revoke_record_cache);
 		revoke_record_cache = NULL;
 		return -ENOMEM;