vserver 1.9.5.x5

[linux-2.6.git] / include / linux / vs_context.h

diff --git a/include/linux/vs_context.h b/include/linux/vs_context.h
index 9d119cd..ab0e56e 100644 (file)
--- a/include/linux/vs_context.h
+++ b/include/linux/vs_context.h
@@ -3,16 +3,9 @@
 
 
 #include <linux/kernel.h>
-#include <linux/rcupdate.h>
-#include <linux/sched.h>
-
-#include "vserver/context.h"
 #include "vserver/debug.h"
 
 
-extern int proc_pid_vx_info(struct task_struct *, char *);
-
-
 #define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__)
 
 static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
@@ -20,9 +13,12 @@ static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
 {
        if (!vxi)
                return NULL;
+
        vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
                vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
                _file, _line);
+       vxh_get_vx_info(vxi);
+
        atomic_inc(&vxi->vx_usecnt);
        return vxi;
 }
@@ -39,10 +35,32 @@ static inline void __put_vx_info(struct vx_info *vxi, const char *_file, int _li
        vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
                vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
                _file, _line);
+       vxh_put_vx_info(vxi);
+
        if (atomic_dec_and_test(&vxi->vx_usecnt))
                free_vx_info(vxi);
 }
 
+
+#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__)
+
+static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
+               const char *_file, int _line)
+{
+       if (vxi) {
+               vxlprintk(VXD_CBIT(xid, 3),
+                       "init_vx_info(%p[#%d.%d])",
+                       vxi, vxi?vxi->vx_id:0,
+                       vxi?atomic_read(&vxi->vx_usecnt):0,
+                       _file, _line);
+               vxh_init_vx_info(vxi, vxp);
+
+               atomic_inc(&vxi->vx_usecnt);
+       }
+       *vxp = vxi;
+}
+
+
 #define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__)
 
 static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
@@ -53,18 +71,20 @@ static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
        if (!vxi)
                return;
 
-       vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d.%d])",
+       vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
                vxi, vxi?vxi->vx_id:0,
                vxi?atomic_read(&vxi->vx_usecnt):0,
-               vxi?atomic_read(&vxi->vx_refcnt):0,
                _file, _line);
+       vxh_set_vx_info(vxi, vxp);
 
-       atomic_inc(&vxi->vx_refcnt);
-       vxo = xchg(vxp, __get_vx_info(vxi, _file, _line));
+       // vxo = xchg(vxp, __get_vx_info(vxi, _file, _line));
+       atomic_inc(&vxi->vx_usecnt);
+       vxo = xchg(vxp, vxi);
        BUG_ON(vxo);
 }
 
-#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__)
+
+#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__)
 
 static inline void __clr_vx_info(struct vx_info **vxp,
        const char *_file, int _line)
@@ -75,19 +95,56 @@ static inline void __clr_vx_info(struct vx_info **vxp,
        if (!vxo)
                return;
 
-       vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d.%d])",
+       vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
                vxo, vxo?vxo->vx_id:0,
                vxo?atomic_read(&vxo->vx_usecnt):0,
-               vxo?atomic_read(&vxo->vx_refcnt):0,
                _file, _line);
+       vxh_clr_vx_info(vxo, vxp);
 
-       if (atomic_dec_and_test(&vxo->vx_refcnt))
-               unhash_vx_info(vxo);
-       __put_vx_info(vxo, _file, _line);
+       // __put_vx_info(vxo, _file, _line);
+       if (atomic_dec_and_test(&vxo->vx_usecnt))
+               free_vx_info(vxo);
 }
 
 
-#define task_get_vx_info(i)    __task_get_vx_info(i,__FILE__,__LINE__)
+#define claim_vx_info(v,p) __claim_vx_info(v,p,__FILE__,__LINE__)
+
+static inline void __claim_vx_info(struct vx_info *vxi,
+       struct task_struct *task, const char *_file, int _line)
+{
+       vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
+               vxi, vxi?vxi->vx_id:0,
+               vxi?atomic_read(&vxi->vx_usecnt):0,
+               vxi?atomic_read(&vxi->vx_tasks):0,
+               task, _file, _line);
+       vxh_claim_vx_info(vxi, task);
+
+       atomic_inc(&vxi->vx_tasks);
+}
+
+
+extern void unhash_vx_info(struct vx_info *);
+
+#define release_vx_info(v,p) __release_vx_info(v,p,__FILE__,__LINE__)
+
+static inline void __release_vx_info(struct vx_info *vxi,
+       struct task_struct *task, const char *_file, int _line)
+{
+       vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
+               vxi, vxi?vxi->vx_id:0,
+               vxi?atomic_read(&vxi->vx_usecnt):0,
+               vxi?atomic_read(&vxi->vx_tasks):0,
+               task, _file, _line);
+       vxh_release_vx_info(vxi, task);
+
+       might_sleep();
+
+       if (atomic_dec_and_test(&vxi->vx_tasks))
+               unhash_vx_info(vxi);
+}
+
+
+#define task_get_vx_info(p)    __task_get_vx_info(p,__FILE__,__LINE__)
 
 static __inline__ struct vx_info *__task_get_vx_info(struct task_struct *p,
        const char *_file, int _line)
@@ -103,20 +160,6 @@ static __inline__ struct vx_info *__task_get_vx_info(struct task_struct *p,
 }
 
 
-#define vx_verify_info(p,i)    \
-       __vx_verify_info((p)->vx_info,i,__FILE__,__LINE__)
-
-static __inline__ void __vx_verify_info(
-       struct vx_info *vxa, struct vx_info *vxb,
-       const char *_file, int _line)
-{
-       if (vxa == vxb)
-               return;
-       printk(KERN_ERR "vx bad assumption (%p==%p) at %s:%d\n",
-               vxa, vxb, _file, _line);
-}
-
-
 #else
 #warning duplicate inclusion
 #endif