From 564d75f1d74b1a293afb5d6bfd5237521f750fdd Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Thu, 15 Apr 2010 08:03:57 +0200
Subject: [PATCH] --- yaml --- r: 190089 b: refs/heads/master c:
 1f1b0008e8dd1930d6e89522c70f4a438374302a h: refs/heads/master i:   190087:
 ba8e433c4d61b412cd01a7cc1157243927f393e8 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/logfs/logfs.h     | 6 ++++++
 trunk/fs/logfs/readwrite.c | 6 ++----
 trunk/fs/logfs/segment.c   | 2 +-
 trunk/fs/logfs/super.c     | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 176388414b23..2922b588b805 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ead88af5f577fd2b399a0fcdfe52605116fac489
+refs/heads/master: 1f1b0008e8dd1930d6e89522c70f4a438374302a
diff --git a/trunk/fs/logfs/logfs.h b/trunk/fs/logfs/logfs.h
index c9929eed80b1..0a3df1a0c936 100644
--- a/trunk/fs/logfs/logfs.h
+++ b/trunk/fs/logfs/logfs.h
@@ -727,4 +727,10 @@ static inline struct logfs_area *get_area(struct super_block *sb,
 	return logfs_super(sb)->s_area[(__force u8)gc_level];
 }
 
+static inline void logfs_mempool_destroy(mempool_t *pool)
+{
+	if (pool)
+		mempool_destroy(pool);
+}
+
 #endif
diff --git a/trunk/fs/logfs/readwrite.c b/trunk/fs/logfs/readwrite.c
index 7e0c39c49719..aca6c56a107a 100644
--- a/trunk/fs/logfs/readwrite.c
+++ b/trunk/fs/logfs/readwrite.c
@@ -2243,8 +2243,6 @@ void logfs_cleanup_rw(struct super_block *sb)
 	struct logfs_super *super = logfs_super(sb);
 
 	destroy_meta_inode(super->s_segfile_inode);
-	if (super->s_block_pool)
-		mempool_destroy(super->s_block_pool);
-	if (super->s_shadow_pool)
-		mempool_destroy(super->s_shadow_pool);
+	logfs_mempool_destroy(super->s_block_pool);
+	logfs_mempool_destroy(super->s_shadow_pool);
 }
diff --git a/trunk/fs/logfs/segment.c b/trunk/fs/logfs/segment.c
index 02db22ebbf13..8c82fe05d3e1 100644
--- a/trunk/fs/logfs/segment.c
+++ b/trunk/fs/logfs/segment.c
@@ -912,7 +912,7 @@ int logfs_init_areas(struct super_block *sb)
 	for (i--; i >= 0; i--)
 		free_area(super->s_area[i]);
 	free_area(super->s_journal_area);
-	mempool_destroy(super->s_alias_pool);
+	logfs_mempool_destroy(super->s_alias_pool);
 	return -ENOMEM;
 }
 
diff --git a/trunk/fs/logfs/super.c b/trunk/fs/logfs/super.c
index d6e1f4fc3115..d4531eb46d0a 100644
--- a/trunk/fs/logfs/super.c
+++ b/trunk/fs/logfs/super.c
@@ -517,8 +517,8 @@ static void logfs_kill_sb(struct super_block *sb)
 	if (super->s_erase_page)
 		__free_page(super->s_erase_page);
 	super->s_devops->put_device(sb);
-	mempool_destroy(super->s_btree_pool);
-	mempool_destroy(super->s_alias_pool);
+	logfs_mempool_destroy(super->s_btree_pool);
+	logfs_mempool_destroy(super->s_alias_pool);
 	kfree(super);
 	log_super("LogFS: Finished unmounting\n");
 }