1 --- util-vserver-0.30.208/kernel/cvirt_def.h 2005-05-12 19:03:30.000000000 +0200
2 +++ util-vserver-0.30.208.x/kernel/cvirt_def.h 2005-08-02 09:23:07.000000000 +0200
3 @@ -23,10 +23,10 @@ struct _vx_syslog {
4 wait_queue_head_t log_wait;
5 spinlock_t logbuf_lock; /* lock for the log buffer */
7 - unsigned long log_start; /* next char to be read by syslog() */
8 - unsigned long con_start; /* next char to be sent to consoles */
9 - unsigned long log_end; /* most-recently-written-char + 1 */
10 - unsigned long logged_chars; /* #chars since last read+clear operation */
11 + unsigned long log_start; /* next char to be read by syslog() */
12 + unsigned long con_start; /* next char to be sent to consoles */
13 + unsigned long log_end; /* most-recently-written-char + 1 */
14 + unsigned long logged_chars; /* #chars since last read+clear operation */
18 --- util-vserver-0.30.208/kernel/debug.h 2005-07-03 15:59:47.000000000 +0200
19 +++ util-vserver-0.30.208.x/kernel/debug.h 2005-08-02 09:23:07.000000000 +0200
20 @@ -135,10 +135,10 @@ struct _vx_hist_entry {
22 struct _vx_hist_entry *vxh_advance(void *loc);
25 - ({ __label__ here; \
28 +#define VXH_HERE(__type) \
29 + ({ __label__ __vxh_##__type; \
31 + &&__vxh_##__type; })
35 @@ -157,7 +157,7 @@ static inline void __vxh_copy_vxi(struct
36 struct _vx_hist_entry *entry; \
39 - entry = vxh_advance(VXH_HERE()); \
40 + entry = vxh_advance(VXH_HERE(__type)); \
42 entry->type = __type; \
44 @@ -179,7 +179,7 @@ static inline void __name(struct vx_info
47 #define VXH_DATA(__name, __type) \
50 void __name(struct vx_info *vxi, void *data) \
52 __VXH_BODY(__type, __VXH_DATA) \
53 @@ -191,7 +191,7 @@ void __name(struct vx_info *vxi, void *d
56 #define VXH_LARG(__name, __type) \
59 void __name(struct vx_info *vxi, long arg) \
61 __VXH_BODY(__type, __VXH_LARG) \
62 @@ -261,8 +261,11 @@ extern void vxh_dump_history(void);
64 #ifdef CONFIG_VSERVER_DEBUG
65 #define vxd_assert_lock(l) assert_spin_locked(l)
66 +#define vxd_assert(c,f,x...) vxlprintk(!(c), \
67 + "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
69 #define vxd_assert_lock(l) do { } while (0)
70 +#define vxd_assert(c,f,x...) do { } while (0)
74 --- util-vserver-0.30.208/kernel/limit.h 2005-05-12 19:03:30.000000000 +0200
75 +++ util-vserver-0.30.208.x/kernel/limit.h 2005-08-02 09:23:07.000000000 +0200
81 +#define VLIMIT_NSOCK 16
82 +#define VLIMIT_OPENFD 17
83 +#define VLIMIT_ANON 18
84 +#define VLIMIT_SHMEM 19
89 @@ -12,11 +18,6 @@ void vx_vsi_swapinfo(struct sysinfo *);
93 -#define VLIMIT_NSOCK 16
94 -#define VLIMIT_OPENFD 17
95 -#define VLIMIT_ANON 18
96 -#define VLIMIT_SHMEM 19
98 extern const char *vlimit_name[NUM_LIMITS];
100 #endif /* __KERNEL__ */
101 --- util-vserver-0.30.208/kernel/xid.h 2005-07-14 17:22:13.000000000 +0200
102 +++ util-vserver-0.30.208.x/kernel/xid.h 2005-08-02 09:12:01.000000000 +0200
104 #warning config options missing
107 -#define XID_TAG_SB(sb) (sb->s_flags & MS_TAGXID)
109 -#define XID_TAG(in) (!(in) || \
110 - (((struct inode *)in)->i_sb && \
111 - XID_TAG_SB(((struct inode *)in)->i_sb)))
112 +#define XID_TAG(in) (IS_TAGXID(in))
115 #ifdef CONFIG_XID_TAG_NFSD
116 @@ -105,11 +101,17 @@
120 -#ifdef CONFIG_INOXID_NONE
121 +#ifndef CONFIG_INOXID_NONE
122 +#define vx_current_fsxid(sb) \
123 + ((sb)->s_flags & MS_TAGXID ? current->xid : 0)
125 #define vx_current_fsxid(sb) (0)
128 +#ifndef CONFIG_INOXID_INTERN
129 +#define XIDINO_XID(tag, xid) (0)
131 -#define vx_current_fsxid(sb) \
132 - (XID_TAG_SB(sb) ? current->xid : 0)
133 +#define XIDINO_XID(tag, xid) ((tag) ? (xid) : 0)
136 #define INOXID_UID(tag, uid, gid) \