Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[safe/jmp/linux-2.6] / lib / kref.c

diff --git a/lib/kref.c b/lib/kref.c
index 0d07cc3..d3d227a 100644 (file)
--- a/lib/kref.c
+++ b/lib/kref.c
@@ -13,6 +13,7 @@
 
 #include <linux/kref.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 /**
  * kref_init - initialize object.
@@ -20,7 +21,8 @@
  */
 void kref_init(struct kref *kref)
 {
-       atomic_set(&kref->refcount,1);
+       atomic_set(&kref->refcount, 1);
+       smp_mb();
 }
 
 /**
@@ -31,6 +33,7 @@ void kref_get(struct kref *kref)
 {
        WARN_ON(!atomic_read(&kref->refcount));
        atomic_inc(&kref->refcount);
+       smp_mb__after_atomic_inc();
 }
 
 /**