Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/vs_context.h b/include/linux/vs_context.h
index c65ded8..8cdeb8d 100644 (file)
--- a/include/linux/vs_context.h
+++ b/include/linux/vs_context.h
@@ -1,15 +1,14 @@
 #ifndef _VX_VS_CONTEXT_H
 #define _VX_VS_CONTEXT_H
 
-
 #include <linux/kernel.h>
 #include "vserver/debug.h"
 
 
-#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__)
+#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__,__HERE__)
 
 static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
-       const char *_file, int _line)
+       const char *_file, int _line, void *_here)
 {
        if (!vxi)
                return NULL;
@@ -17,7 +16,7 @@ static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
        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);
+       __vxh_get_vx_info(vxi, _here);
 
        atomic_inc(&vxi->vx_usecnt);
        return vxi;
@@ -26,10 +25,10 @@ static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
 
 extern void free_vx_info(struct vx_info *);
 
-#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__)
+#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__,__HERE__)
 
 static inline void __put_vx_info(struct vx_info *vxi,
-       const char *_file, int _line)
+       const char *_file, int _line, void *_here)
 {
        if (!vxi)
                return;
@@ -37,17 +36,17 @@ static inline void __put_vx_info(struct vx_info *vxi,
        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);
+       __vxh_put_vx_info(vxi, _here);
 
        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__)
+#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__)
 
 static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-       const char *_file, int _line)
+       const char *_file, int _line, void *_here)
 {
        if (vxi) {
                vxlprintk(VXD_CBIT(xid, 3),
@@ -55,7 +54,7 @@ static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
                        vxi, vxi?vxi->vx_id:0,
                        vxi?atomic_read(&vxi->vx_usecnt):0,
                        _file, _line);
-               vxh_init_vx_info(vxi, vxp);
+               __vxh_init_vx_info(vxi, vxp, _here);
 
                atomic_inc(&vxi->vx_usecnt);
        }
@@ -63,10 +62,10 @@ static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
 }
 
 
-#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__)
+#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__)
 
 static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-       const char *_file, int _line)
+       const char *_file, int _line, void *_here)
 {
        struct vx_info *vxo;
 
@@ -77,7 +76,7 @@ static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
                vxi, vxi?vxi->vx_id:0,
                vxi?atomic_read(&vxi->vx_usecnt):0,
                _file, _line);
-       vxh_set_vx_info(vxi, vxp);
+       __vxh_set_vx_info(vxi, vxp, _here);
 
        atomic_inc(&vxi->vx_usecnt);
        vxo = xchg(vxp, vxi);
@@ -85,10 +84,10 @@ static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
 }
 
 
-#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__)
+#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__)
 
 static inline void __clr_vx_info(struct vx_info **vxp,
-       const char *_file, int _line)
+       const char *_file, int _line, void *_here)
 {
        struct vx_info *vxo;
 
@@ -100,24 +99,26 @@ static inline void __clr_vx_info(struct vx_info **vxp,
                vxo, vxo?vxo->vx_id:0,
                vxo?atomic_read(&vxo->vx_usecnt):0,
                _file, _line);
-       vxh_clr_vx_info(vxo, vxp);
+       __vxh_clr_vx_info(vxo, vxp, _here);
 
        if (atomic_dec_and_test(&vxo->vx_usecnt))
                free_vx_info(vxo);
 }
 
 
-#define claim_vx_info(v,p) __claim_vx_info(v,p,__FILE__,__LINE__)
+#define claim_vx_info(v,p) \
+       __claim_vx_info(v,p,__FILE__,__LINE__,__HERE__)
 
 static inline void __claim_vx_info(struct vx_info *vxi,
-       struct task_struct *task, const char *_file, int _line)
+       struct task_struct *task,
+       const char *_file, int _line, void *_here)
 {
        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);
+       __vxh_claim_vx_info(vxi, task, _here);
 
        atomic_inc(&vxi->vx_tasks);
 }
@@ -125,17 +126,19 @@ static inline void __claim_vx_info(struct vx_info *vxi,
 
 extern void unhash_vx_info(struct vx_info *);
 
-#define release_vx_info(v,p) __release_vx_info(v,p,__FILE__,__LINE__)
+#define release_vx_info(v,p) \
+       __release_vx_info(v,p,__FILE__,__LINE__,__HERE__)
 
 static inline void __release_vx_info(struct vx_info *vxi,
-       struct task_struct *task, const char *_file, int _line)
+       struct task_struct *task,
+       const char *_file, int _line, void *_here)
 {
        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);
+       __vxh_release_vx_info(vxi, task, _here);
 
        might_sleep();
 
@@ -144,17 +147,18 @@ static inline void __release_vx_info(struct vx_info *vxi,
 }
 
 
-#define task_get_vx_info(p)    __task_get_vx_info(p,__FILE__,__LINE__)
+#define task_get_vx_info(p) \
+       __task_get_vx_info(p,__FILE__,__LINE__,__HERE__)
 
-static __inline__ struct vx_info *__task_get_vx_info(struct task_struct *p,
-       const char *_file, int _line)
+static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
+       const char *_file, int _line, void *_here)
 {
        struct vx_info *vxi;
 
        task_lock(p);
        vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
                p, _file, _line);
-       vxi = __get_vx_info(p->vx_info, _file, _line);
+       vxi = __get_vx_info(p->vx_info, _file, _line, _here);
        task_unlock(p);
        return vxi;
 }
@@ -166,6 +170,29 @@ static inline void __wakeup_vx_info(struct vx_info *vxi)
                wake_up_interruptible(&vxi->vx_wait);
 }
 
+extern void exit_vx_info(struct task_struct *, int);
+
+static inline
+struct task_struct *vx_child_reaper(struct task_struct *p)
+{
+       struct vx_info *vxi = p->vx_info;
+       struct task_struct *reaper = child_reaper;
+
+       if (!vxi)
+               goto out;
+
+       BUG_ON(!p->vx_info->vx_reaper);
+
+       /* child reaper for the guest reaper */
+       if (vxi->vx_reaper == p)
+               goto out;
+
+       reaper = vxi->vx_reaper;
+out:
+       return reaper;
+}
+
+
 #else
 #warning duplicate inclusion
 #endif