From ad8ff7a3e6c9a74e2b65e6acef2b310e3623a7fb Mon Sep 17 00:00:00 2001
From: Jesper Dangaard Brouer <hawk@comx.dk>
Date: Sun, 5 Jul 2009 22:29:27 -0400
Subject: [PATCH] --- yaml --- r: 155435 b: refs/heads/master c:
 3e03f9ca6a2599db1823bb0ea24e0845219a0e69 h: refs/heads/master i:   155433:
 b8965cb079eeba1a5ca31ffcbee8b86d5ee0f99e   155431:
 f2630f20a689a72cf48e5df73400f1cfecea019e v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 20df3c7238e4..0664feea79b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 726447d803802cd0be8f62d17c4a34421781b938
+refs/heads/master: 3e03f9ca6a2599db1823bb0ea24e0845219a0e69
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index 4a45efabb203..2fcaf286f1de 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -2909,7 +2909,11 @@ int __init init_ext4_mballoc(void)
 
 void exit_ext4_mballoc(void)
 {
-	/* XXX: synchronize_rcu(); */
+	/* 
+	 * Wait for completion of call_rcu()'s on ext4_pspace_cachep
+	 * before destroying the slab cache.
+	 */
+	rcu_barrier();
 	kmem_cache_destroy(ext4_pspace_cachep);
 	kmem_cache_destroy(ext4_ac_cachep);
 	kmem_cache_destroy(ext4_free_ext_cachep);