Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / namespace.h

diff --git a/include/linux/namespace.h b/include/linux/namespace.h
index 697991b69f9b6d09e7d18f087490e66b018a78d1..6731977c4c13a00e39a251a12d7be31311960062 100644 (file)
--- a/include/linux/namespace.h
+++ b/include/linux/namespace.h
@@ -9,7 +9,8 @@ struct namespace {
        atomic_t                count;
        struct vfsmount *       root;
        struct list_head        list;
-       struct rw_semaphore     sem;
+       wait_queue_head_t poll;
+       int event;
 };
 
 extern int copy_namespace(int, struct task_struct *);
@@ -17,7 +18,8 @@ extern void __put_namespace(struct namespace *namespace);
 
 static inline void put_namespace(struct namespace *namespace)
 {
-       if (atomic_dec_and_test(&namespace->count))
+       if (atomic_dec_and_lock(&namespace->count, &vfsmount_lock))
+               /* releases vfsmount_lock */
                __put_namespace(namespace);
 }