diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_context.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_context.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_context.h 2007-02-06 04:58:45 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_context.h 2007-06-13 17:24:44 +0200 @@ -7,7 +7,7 @@ #include "vserver/debug.h" -#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__,__HERE__) +#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, void *_here) @@ -16,7 +16,8 @@ static inline struct vx_info *__get_vx_i 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, + vxi, vxi ? vxi->vx_id : 0, + vxi ? atomic_read(&vxi->vx_usecnt) : 0, _file, _line); __vxh_get_vx_info(vxi, _here); @@ -27,7 +28,7 @@ static inline struct vx_info *__get_vx_i extern void free_vx_info(struct vx_info *); -#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__,__HERE__) +#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, void *_here) @@ -36,7 +37,8 @@ static inline void __put_vx_info(struct return; vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])", - vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0, + vxi, vxi ? vxi->vx_id : 0, + vxi ? atomic_read(&vxi->vx_usecnt) : 0, _file, _line); __vxh_put_vx_info(vxi, _here); @@ -45,7 +47,8 @@ static inline void __put_vx_info(struct } -#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__) +#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, void *_here) @@ -53,8 +56,8 @@ static inline void __init_vx_info(struct 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, + vxi, vxi ? vxi->vx_id : 0, + vxi ? atomic_read(&vxi->vx_usecnt) : 0, _file, _line); __vxh_init_vx_info(vxi, vxp, _here); @@ -64,7 +67,8 @@ static inline void __init_vx_info(struct } -#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__) +#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, void *_here) @@ -75,8 +79,8 @@ static inline void __set_vx_info(struct return; 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, vxi ? vxi->vx_id : 0, + vxi ? atomic_read(&vxi->vx_usecnt) : 0, _file, _line); __vxh_set_vx_info(vxi, vxp, _here); @@ -86,7 +90,7 @@ static inline void __set_vx_info(struct } -#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__) +#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, void *_here) @@ -98,8 +102,8 @@ static inline void __clr_vx_info(struct return; 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, vxo ? vxo->vx_id : 0, + vxo ? atomic_read(&vxo->vx_usecnt) : 0, _file, _line); __vxh_clr_vx_info(vxo, vxp, _here); @@ -108,17 +112,17 @@ static inline void __clr_vx_info(struct } -#define claim_vx_info(v,p) \ - __claim_vx_info(v,p,__FILE__,__LINE__,__HERE__) +#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, 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, + 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, _here); @@ -128,17 +132,17 @@ static inline void __claim_vx_info(struc extern void unhash_vx_info(struct vx_info *); -#define release_vx_info(v,p) \ - __release_vx_info(v,p,__FILE__,__LINE__,__HERE__) +#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, 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, + 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, _here); @@ -150,7 +154,7 @@ static inline void __release_vx_info(str #define task_get_vx_info(p) \ - __task_get_vx_info(p,__FILE__,__LINE__,__HERE__) + __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, void *_here) @@ -173,7 +177,7 @@ static inline void __wakeup_vx_info(stru } -#define enter_vx_info(v,s) __enter_vx_info(v,s,__FILE__,__LINE__) +#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__) static inline void __enter_vx_info(struct vx_info *vxi, struct vx_info_save *vxis, const char *_file, int _line) @@ -186,7 +190,7 @@ static inline void __enter_vx_info(struc current->xid = vxi ? vxi->vx_id : 0; } -#define leave_vx_info(s) __leave_vx_info(s,__FILE__,__LINE__) +#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__) static inline void __leave_vx_info(struct vx_info_save *vxis, const char *_file, int _line) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_cowbl.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_cowbl.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_cowbl.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_cowbl.h 2007-06-13 16:44:33 +0200 @@ -31,7 +31,7 @@ static inline int cow_check_and_break(st } else error = PTR_ERR(new_dentry); } else { - inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE); + inode->i_flags &= ~(S_IUNLINK | S_IMMUTABLE); inode->i_ctime = CURRENT_TIME; mark_inode_dirty(inode); } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_dlimit.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_dlimit.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_dlimit.h 2007-03-10 18:02:51 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_dlimit.h 2007-06-13 16:51:59 +0200 @@ -6,7 +6,7 @@ #include "vserver/debug.h" -#define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__) +#define get_dl_info(i) __get_dl_info(i, __FILE__, __LINE__) static inline struct dl_info *__get_dl_info(struct dl_info *dli, const char *_file, int _line) @@ -14,7 +14,8 @@ static inline struct dl_info *__get_dl_i if (!dli) return NULL; vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])", - dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0, + dli, dli ? dli->dl_tag : 0, + dli ? atomic_read(&dli->dl_usecnt) : 0, _file, _line); atomic_inc(&dli->dl_usecnt); return dli; @@ -22,9 +23,9 @@ static inline struct dl_info *__get_dl_i #define free_dl_info(i) \ - call_rcu(&i->dl_rcu, rcu_free_dl_info); + call_rcu(&(i)->dl_rcu, rcu_free_dl_info) -#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__) +#define put_dl_info(i) __put_dl_info(i, __FILE__, __LINE__) static inline void __put_dl_info(struct dl_info *dli, const char *_file, int _line) @@ -32,14 +33,15 @@ static inline void __put_dl_info(struct if (!dli) return; vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])", - dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0, + dli, dli ? dli->dl_tag : 0, + dli ? atomic_read(&dli->dl_usecnt) : 0, _file, _line); if (atomic_dec_and_test(&dli->dl_usecnt)) free_dl_info(dli); } -#define __dlimit_char(d) ((d)?'*':' ') +#define __dlimit_char(d) ((d) ? '*' : ' ') static inline int __dl_alloc_space(struct super_block *sb, tag_t tag, dlsize_t nr, const char *file, int line) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_limit.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_limit.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_limit.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_limit.h 2007-06-13 16:53:55 +0200 @@ -9,22 +9,22 @@ #include "vserver/limit_int.h" -#define vx_acc_cres(v,d,p,r) \ +#define vx_acc_cres(v, d, p, r) \ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__) -#define vx_acc_cres_cond(x,d,p,r) \ +#define vx_acc_cres_cond(x, d, p, r) \ __vx_acc_cres(((x) == vx_current_xid()) ? current->vx_info : 0, \ r, d, p, __FILE__, __LINE__) -#define vx_add_cres(v,a,p,r) \ +#define vx_add_cres(v, a, p, r) \ __vx_add_cres(v, r, a, p, __FILE__, __LINE__) -#define vx_sub_cres(v,a,p,r) vx_add_cres(v,-(a),p,r) +#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r) -#define vx_add_cres_cond(x,a,p,r) \ +#define vx_add_cres_cond(x, a, p, r) \ __vx_add_cres(((x) == vx_current_xid()) ? current->vx_info : 0, \ r, a, p, __FILE__, __LINE__) -#define vx_sub_cres_cond(x,a,p,r) vx_add_cres_cond(x,-(a),p,r) +#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r) /* process and file limits */ @@ -54,7 +54,7 @@ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD) -#define vx_cres_avail(v,n,r) \ +#define vx_cres_avail(v, n, r) \ __vx_cres_avail(v, r, n, __FILE__, __LINE__) @@ -101,23 +101,23 @@ /* ipc resource limits */ -#define vx_ipcmsg_add(v,u,a) \ +#define vx_ipcmsg_add(v, u, a) \ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE) -#define vx_ipcmsg_sub(v,u,a) \ +#define vx_ipcmsg_sub(v, u, a) \ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE) -#define vx_ipcmsg_avail(v,a) \ +#define vx_ipcmsg_avail(v, a) \ vx_cres_avail(v, a, RLIMIT_MSGQUEUE) -#define vx_ipcshm_add(v,k,a) \ +#define vx_ipcshm_add(v, k, a) \ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) -#define vx_ipcshm_sub(v,k,a) \ +#define vx_ipcshm_sub(v, k, a) \ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) -#define vx_ipcshm_avail(v,a) \ +#define vx_ipcshm_avail(v, a) \ vx_cres_avail(v, a, VLIMIT_SHMEM) @@ -125,7 +125,7 @@ vx_acc_cres(current->vx_info, 1, a, VLIMIT_SEMARY) #define vx_semary_dec(a) \ - vx_acc_cres(current->vx_info,-1, a, VLIMIT_SEMARY) + vx_acc_cres(current->vx_info, -1, a, VLIMIT_SEMARY) #define vx_nsems_add(a,n) \ diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_memory.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_memory.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_memory.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_memory.h 2007-06-13 16:54:40 +0200 @@ -9,22 +9,22 @@ #include "vserver/limit_int.h" -#define __acc_add_long(a,v) (*(v) += (a)) +#define __acc_add_long(a, v) (*(v) += (a)) #define __acc_inc_long(v) (++*(v)) #define __acc_dec_long(v) (--*(v)) #if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS -#define __acc_add_atomic(a,v) atomic_long_add(a,v) +#define __acc_add_atomic(a, v) atomic_long_add(a, v) #define __acc_inc_atomic(v) atomic_long_inc(v) #define __acc_dec_atomic(v) atomic_long_dec(v) #else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */ -#define __acc_add_atomic(a,v) __acc_add_long(a,v) +#define __acc_add_atomic(a, v) __acc_add_long(a, v) #define __acc_inc_atomic(v) __acc_inc_long(v) #define __acc_dec_atomic(v) __acc_dec_long(v) #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */ -#define vx_acc_page(m,d,v,r) do { \ +#define vx_acc_page(m, d, v, r) do { \ if ((d) > 0) \ __acc_inc_long(&(m->v)); \ else \ @@ -32,7 +32,7 @@ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \ } while (0) -#define vx_acc_page_atomic(m,d,v,r) do { \ +#define vx_acc_page_atomic(m, d, v, r) do { \ if ((d) > 0) \ __acc_inc_atomic(&(m->v)); \ else \ @@ -41,13 +41,13 @@ } while (0) -#define vx_acc_pages(m,p,v,r) do { \ +#define vx_acc_pages(m, p, v, r) do { \ unsigned long __p = (p); \ __acc_add_long(__p, &(m->v)); \ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \ } while (0) -#define vx_acc_pages_atomic(m,p,v,r) do { \ +#define vx_acc_pages_atomic(m, p, v, r) do { \ unsigned long __p = (p); \ __acc_add_atomic(__p, &(m->v)); \ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \ @@ -55,57 +55,57 @@ -#define vx_acc_vmpage(m,d) \ +#define vx_acc_vmpage(m, d) \ vx_acc_page(m, d, total_vm, RLIMIT_AS) -#define vx_acc_vmlpage(m,d) \ +#define vx_acc_vmlpage(m, d) \ vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK) -#define vx_acc_file_rsspage(m,d) \ +#define vx_acc_file_rsspage(m, d) \ vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED) -#define vx_acc_anon_rsspage(m,d) \ +#define vx_acc_anon_rsspage(m, d) \ vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON) -#define vx_acc_vmpages(m,p) \ +#define vx_acc_vmpages(m, p) \ vx_acc_pages(m, p, total_vm, RLIMIT_AS) -#define vx_acc_vmlpages(m,p) \ +#define vx_acc_vmlpages(m, p) \ vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK) -#define vx_acc_file_rsspages(m,p) \ +#define vx_acc_file_rsspages(m, p) \ vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED) -#define vx_acc_anon_rsspages(m,p) \ +#define vx_acc_anon_rsspages(m, p) \ vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON) -#define vx_pages_add(s,r,p) __vx_add_cres(s, r, p, 0, __FILE__, __LINE__) -#define vx_pages_sub(s,r,p) vx_pages_add(s, r, -(p)) +#define vx_pages_add(s, r, p) __vx_add_cres(s, r, p, 0, __FILE__, __LINE__) +#define vx_pages_sub(s, r, p) vx_pages_add(s, r, -(p)) #define vx_vmpages_inc(m) vx_acc_vmpage(m, 1) -#define vx_vmpages_dec(m) vx_acc_vmpage(m,-1) -#define vx_vmpages_add(m,p) vx_acc_vmpages(m, p) -#define vx_vmpages_sub(m,p) vx_acc_vmpages(m,-(p)) +#define vx_vmpages_dec(m) vx_acc_vmpage(m, -1) +#define vx_vmpages_add(m, p) vx_acc_vmpages(m, p) +#define vx_vmpages_sub(m, p) vx_acc_vmpages(m, -(p)) #define vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1) -#define vx_vmlocked_dec(m) vx_acc_vmlpage(m,-1) -#define vx_vmlocked_add(m,p) vx_acc_vmlpages(m, p) -#define vx_vmlocked_sub(m,p) vx_acc_vmlpages(m,-(p)) +#define vx_vmlocked_dec(m) vx_acc_vmlpage(m, -1) +#define vx_vmlocked_add(m, p) vx_acc_vmlpages(m, p) +#define vx_vmlocked_sub(m, p) vx_acc_vmlpages(m, -(p)) #define vx_file_rsspages_inc(m) vx_acc_file_rsspage(m, 1) -#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m,-1) -#define vx_file_rsspages_add(m,p) vx_acc_file_rsspages(m, p) -#define vx_file_rsspages_sub(m,p) vx_acc_file_rsspages(m,-(p)) +#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m, -1) +#define vx_file_rsspages_add(m, p) vx_acc_file_rsspages(m, p) +#define vx_file_rsspages_sub(m, p) vx_acc_file_rsspages(m, -(p)) #define vx_anon_rsspages_inc(m) vx_acc_anon_rsspage(m, 1) -#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m,-1) -#define vx_anon_rsspages_add(m,p) vx_acc_anon_rsspages(m, p) -#define vx_anon_rsspages_sub(m,p) vx_acc_anon_rsspages(m,-(p)) +#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m, -1) +#define vx_anon_rsspages_add(m, p) vx_acc_anon_rsspages(m, p) +#define vx_anon_rsspages_sub(m, p) vx_acc_anon_rsspages(m, -(p)) -#define vx_pages_avail(m,p,r) \ +#define vx_pages_avail(m, p, r) \ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__) -#define vx_vmpages_avail(m,p) vx_pages_avail(m, p, RLIMIT_AS) -#define vx_vmlocked_avail(m,p) vx_pages_avail(m, p, RLIMIT_MEMLOCK) -#define vx_anon_avail(m,p) vx_pages_avail(m, p, VLIMIT_ANON) -#define vx_mapped_avail(m,p) vx_pages_avail(m, p, VLIMIT_MAPPED) +#define vx_vmpages_avail(m, p) vx_pages_avail(m, p, RLIMIT_AS) +#define vx_vmlocked_avail(m, p) vx_pages_avail(m, p, RLIMIT_MEMLOCK) +#define vx_anon_avail(m, p) vx_pages_avail(m, p, VLIMIT_ANON) +#define vx_mapped_avail(m, p) vx_pages_avail(m, p, VLIMIT_MAPPED) -#define vx_rss_avail(m,p) \ +#define vx_rss_avail(m, p) \ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__) @@ -119,7 +119,7 @@ enum { }; #if 0 -#define vx_page_fault(mm,vma,type,ret) +#define vx_page_fault(mm, vma, type, ret) #else static inline @@ -130,7 +130,7 @@ void __vx_page_fault(struct mm_struct *m int what; /* static char *page_type[6] = - { "UNKNOWN", "ANON","NONE", "FILE", "SWAP", "WRITE" }; + { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" }; static char *page_what[4] = { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" }; */ @@ -148,7 +148,7 @@ void __vx_page_fault(struct mm_struct *m atomic_inc(&vxi->cacct.page[type][what]); } -#define vx_page_fault(mm,vma,type,ret) __vx_page_fault(mm,vma,type,ret) +#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret) #endif diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_network.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_network.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_network.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_network.h 2007-06-13 17:30:17 +0200 @@ -7,7 +7,7 @@ #include "vserver/debug.h" -#define get_nx_info(i) __get_nx_info(i,__FILE__,__LINE__) +#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__) static inline struct nx_info *__get_nx_info(struct nx_info *nxi, const char *_file, int _line) @@ -16,7 +16,8 @@ static inline struct nx_info *__get_nx_i return NULL; vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])", - nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0, + nxi, nxi ? nxi->nx_id : 0, + nxi ? atomic_read(&nxi->nx_usecnt) : 0, _file, _line); atomic_inc(&nxi->nx_usecnt); @@ -26,7 +27,7 @@ static inline struct nx_info *__get_nx_i extern void free_nx_info(struct nx_info *); -#define put_nx_info(i) __put_nx_info(i,__FILE__,__LINE__) +#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__) static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line) { @@ -34,7 +35,8 @@ static inline void __put_nx_info(struct return; vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])", - nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0, + nxi, nxi ? nxi->nx_id : 0, + nxi ? atomic_read(&nxi->nx_usecnt) : 0, _file, _line); if (atomic_dec_and_test(&nxi->nx_usecnt)) @@ -42,7 +44,7 @@ static inline void __put_nx_info(struct } -#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__) +#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__) static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi, const char *_file, int _line) @@ -50,8 +52,8 @@ static inline void __init_nx_info(struct if (nxi) { vxlprintk(VXD_CBIT(nid, 3), "init_nx_info(%p[#%d.%d])", - nxi, nxi?nxi->nx_id:0, - nxi?atomic_read(&nxi->nx_usecnt):0, + nxi, nxi ? nxi->nx_id : 0, + nxi ? atomic_read(&nxi->nx_usecnt) : 0, _file, _line); atomic_inc(&nxi->nx_usecnt); @@ -60,7 +62,7 @@ static inline void __init_nx_info(struct } -#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__) +#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__) static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi, const char *_file, int _line) @@ -71,8 +73,8 @@ static inline void __set_nx_info(struct return; vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])", - nxi, nxi?nxi->nx_id:0, - nxi?atomic_read(&nxi->nx_usecnt):0, + nxi, nxi ? nxi->nx_id : 0, + nxi ? atomic_read(&nxi->nx_usecnt) : 0, _file, _line); atomic_inc(&nxi->nx_usecnt); @@ -80,7 +82,7 @@ static inline void __set_nx_info(struct BUG_ON(nxo); } -#define clr_nx_info(p) __clr_nx_info(p,__FILE__,__LINE__) +#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__) static inline void __clr_nx_info(struct nx_info **nxp, const char *_file, int _line) @@ -92,8 +94,8 @@ static inline void __clr_nx_info(struct return; vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])", - nxo, nxo?nxo->nx_id:0, - nxo?atomic_read(&nxo->nx_usecnt):0, + nxo, nxo ? nxo->nx_id : 0, + nxo ? atomic_read(&nxo->nx_usecnt) : 0, _file, _line); if (atomic_dec_and_test(&nxo->nx_usecnt)) @@ -101,13 +103,13 @@ static inline void __clr_nx_info(struct } -#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__) +#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__) static inline void __claim_nx_info(struct nx_info *nxi, struct task_struct *task, const char *_file, int _line) { vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p", - nxi, nxi?nxi->nx_id:0, + nxi, nxi ? nxi->nx_id : 0, nxi?atomic_read(&nxi->nx_usecnt):0, nxi?atomic_read(&nxi->nx_tasks):0, task, _file, _line); @@ -118,15 +120,15 @@ static inline void __claim_nx_info(struc extern void unhash_nx_info(struct nx_info *); -#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__) +#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__) static inline void __release_nx_info(struct nx_info *nxi, struct task_struct *task, const char *_file, int _line) { vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p", - nxi, nxi?nxi->nx_id:0, - nxi?atomic_read(&nxi->nx_usecnt):0, - nxi?atomic_read(&nxi->nx_tasks):0, + nxi, nxi ? nxi->nx_id : 0, + nxi ? atomic_read(&nxi->nx_usecnt) : 0, + nxi ? atomic_read(&nxi->nx_tasks) : 0, task, _file, _line); might_sleep(); @@ -136,7 +138,7 @@ static inline void __release_nx_info(str } -#define task_get_nx_info(i) __task_get_nx_info(i,__FILE__,__LINE__) +#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__) static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p, const char *_file, int _line) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_pid.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_pid.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_pid.h 2007-03-25 00:57:25 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_pid.h 2007-06-13 17:20:26 +0200 @@ -10,10 +10,10 @@ /* pid faking stuff */ -#define vx_info_map_pid(v,p) \ +#define vx_info_map_pid(v, p) \ __vx_info_map_pid((v), (p), __FUNC__, __FILE__, __LINE__) #define vx_info_map_tgid(v,p) vx_info_map_pid(v,p) -#define vx_map_pid(p) vx_info_map_pid(current->vx_info, p) +#define vx_map_pid(p) vx_info_map_pid(current->vx_info, p) #define vx_map_tgid(p) vx_map_pid(p) static inline int __vx_info_map_pid(struct vx_info *vxi, int pid, @@ -23,7 +23,7 @@ static inline int __vx_info_map_pid(stru vxfprintk(VXD_CBIT(cvirt, 2), "vx_map_tgid: %p/%llx: %d -> %d", vxi, (long long)vxi->vx_flags, pid, - (pid && pid == vxi->vx_initpid)?1:pid, + (pid && pid == vxi->vx_initpid) ? 1 : pid, func, file, line); if (pid == 0) return 0; @@ -33,9 +33,9 @@ static inline int __vx_info_map_pid(stru return pid; } -#define vx_info_rmap_pid(v,p) \ +#define vx_info_rmap_pid(v, p) \ __vx_info_rmap_pid((v), (p), __FUNC__, __FILE__, __LINE__) -#define vx_rmap_pid(p) vx_info_rmap_pid(current->vx_info, p) +#define vx_rmap_pid(p) vx_info_rmap_pid(current->vx_info, p) #define vx_rmap_tgid(p) vx_rmap_pid(p) static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid, @@ -45,7 +45,7 @@ static inline int __vx_info_rmap_pid(str vxfprintk(VXD_CBIT(cvirt, 2), "vx_rmap_tgid: %p/%llx: %d -> %d", vxi, (long long)vxi->vx_flags, pid, - (pid == 1)?vxi->vx_initpid:pid, + (pid == 1) ? vxi->vx_initpid : pid, func, file, line); if ((pid == 1) && vxi->vx_initpid) return vxi->vx_initpid; diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_socket.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_socket.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_socket.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_socket.h 2007-06-13 17:21:27 +0200 @@ -29,8 +29,8 @@ static inline int vx_sock_type(int famil } } -#define vx_acc_sock(v,f,p,s) \ - __vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__) +#define vx_acc_sock(v, f, p, s) \ + __vx_acc_sock(v, f, p, s, __FILE__, __LINE__) static inline void __vx_acc_sock(struct vx_info *vxi, int family, int pos, int size, char *file, int line) @@ -43,12 +43,12 @@ static inline void __vx_acc_sock(struct } } -#define vx_sock_recv(sk,s) \ - vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, (s)) -#define vx_sock_send(sk,s) \ - vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, (s)) -#define vx_sock_fail(sk,s) \ - vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, (s)) +#define vx_sock_recv(sk, s) \ + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s) +#define vx_sock_send(sk, s) \ + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s) +#define vx_sock_fail(sk, s) \ + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s) #define sock_vx_init(s) do { \ diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_tag.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_tag.h --- linux-2.6.20.14-vs2.2.0/include/linux/vs_tag.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vs_tag.h 2007-06-13 17:22:34 +0200 @@ -18,9 +18,9 @@ #define dx_current_tag() dx_task_tag(current) -#define dx_check(c,m) __dx_check(dx_current_tag(),c,m) +#define dx_check(c, m) __dx_check(dx_current_tag(), c, m) -#define dx_weak_check(c,m) ((m) ? dx_check(c,m) : 1) +#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1) /* diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/base.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/base.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/base.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/base.h 2007-06-13 09:47:05 +0200 @@ -96,9 +96,9 @@ static inline int __vs_check(int cid, in #define current_vx_info() (current->vx_info) -#define vx_check(c,m) __vs_check(vx_current_xid(),c,(m)|VS_IRQ) +#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ) -#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1) +#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1) #define nx_task_nid(t) ((t)->nid) @@ -108,21 +108,21 @@ static inline int __vs_check(int cid, in #define current_nx_info() (current->nx_info) -#define nx_check(c,m) __vs_check(nx_current_nid(),c,m) +#define nx_check(c, m) __vs_check(nx_current_nid(), c, m) -#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1) +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) /* generic flag merging */ -#define vs_check_flags(v,m,f) (((v) & (m)) ^ (f)) +#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f)) -#define vs_mask_flags(v,f,m) (((v) & ~(m)) | ((f) & (m))) +#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m))) -#define vs_mask_mask(v,f,m) (((v) & ~(m)) | ((v) & (f) & (m))) +#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m))) -#define vs_check_bit(v,n) ((v) & (1LL << (n))) +#define vs_check_bit(v, n) ((v) & (1LL << (n))) /* context flags */ @@ -131,13 +131,13 @@ static inline int __vs_check(int cid, in #define vx_current_flags() __vx_flags(current->vx_info) -#define vx_info_flags(v,m,f) \ - vs_check_flags(__vx_flags(v),(m),(f)) +#define vx_info_flags(v, m, f) \ + vs_check_flags(__vx_flags(v), m, f) -#define task_vx_flags(t,m,f) \ - ((t) && vx_info_flags((t)->vx_info, (m), (f))) +#define task_vx_flags(t, m, f) \ + ((t) && vx_info_flags((t)->vx_info, m, f)) -#define vx_flags(m,f) vx_info_flags(current->vx_info,(m),(f)) +#define vx_flags(m, f) vx_info_flags(current->vx_info, m, f) /* context caps */ @@ -146,9 +146,9 @@ static inline int __vs_check(int cid, in #define vx_current_ccaps() __vx_ccaps(current->vx_info) -#define vx_info_ccaps(v,c) (__vx_ccaps(v) & (c)) +#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c)) -#define vx_ccaps(c) vx_info_ccaps(current->vx_info,(c)) +#define vx_ccaps(c) vx_info_ccaps(current->vx_info, (c)) @@ -158,13 +158,13 @@ static inline int __vs_check(int cid, in #define nx_current_flags() __nx_flags(current->nx_info) -#define nx_info_flags(v,m,f) \ - vs_check_flags(__nx_flags(v),(m),(f)) +#define nx_info_flags(v, m, f) \ + vs_check_flags(__nx_flags(v), m, f) -#define task_nx_flags(t,m,f) \ - ((t) && nx_info_flags((t)->nx_info, (m), (f))) +#define task_nx_flags(t, m, f) \ + ((t) && nx_info_flags((t)->nx_info, m, f)) -#define nx_flags(m,f) nx_info_flags(current->nx_info,(m),(f)) +#define nx_flags(m, f) nx_info_flags(current->nx_info, m, f) /* network caps */ @@ -173,18 +173,18 @@ static inline int __vs_check(int cid, in #define nx_current_ncaps() __nx_ncaps(current->nx_info) -#define nx_info_ncaps(v,c) (__nx_ncaps(v) & (c)) +#define nx_info_ncaps(v, c) (__nx_ncaps(v) & (c)) -#define nx_ncaps(c) nx_info_ncaps(current->nx_info,(c)) +#define nx_ncaps(c) nx_info_ncaps(current->nx_info, c) /* context mask capabilities */ #define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 ) -#define vx_info_mcaps(v,c) (__vx_mcaps(v) & (c)) +#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c)) -#define vx_mcaps(c) vx_info_mcaps(current->vx_info,(c)) +#define vx_mcaps(c) vx_info_mcaps(current->vx_info, c) /* context bcap mask */ @@ -193,9 +193,9 @@ static inline int __vs_check(int cid, in #define vx_current_bcaps() __vx_bcaps(current->vx_info) -#define vx_info_bcaps(v,c) (__vx_bcaps(v) & (c)) +#define vx_info_bcaps(v, c) (__vx_bcaps(v) & (c)) -#define vx_bcaps(c) vx_info_bcaps(current->vx_info,(c)) +#define vx_bcaps(c) vx_info_bcaps(current->vx_info, c) #define vx_info_cap_bset(v) ((v) ? (v)->vx_cap_bset : cap_bset) @@ -203,21 +203,21 @@ static inline int __vs_check(int cid, in #define vx_current_cap_bset() vx_info_cap_bset(current->vx_info) -#define __vx_info_mbcap(v,b) \ +#define __vx_info_mbcap(v, b) \ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \ vx_info_bcaps(v, b) : (b)) -#define vx_info_mbcap(v,b) __vx_info_mbcap(v,cap_t(b)) +#define vx_info_mbcap(v, b) __vx_info_mbcap(v, cap_t(b)) -#define task_vx_mbcap(t,b) \ +#define task_vx_mbcap(t, b) \ vx_info_mbcap((t)->vx_info, (t)->b) -#define vx_mbcap(b) task_vx_mbcap(current,b) +#define vx_mbcap(b) task_vx_mbcap(current, b) -#define vx_cap_raised(v,c,f) (vx_info_mbcap(v,c) & CAP_TO_MASK(f)) +#define vx_cap_raised(v, c, f) (vx_info_mbcap(v, c) & CAP_TO_MASK(f)) -#define vx_capable(b,c) (capable(b) || \ - (cap_raised(current->cap_effective,b) && vx_ccaps(c))) +#define vx_capable(b, c) (capable(b) || \ + (cap_raised(current->cap_effective, b) && vx_ccaps(c))) #define vx_current_initpid(n) \ @@ -227,11 +227,11 @@ static inline int __vs_check(int cid, in #define __vx_state(v) ((v) ? ((v)->vx_state) : 0) -#define vx_info_state(v,m) (__vx_state(v) & (m)) +#define vx_info_state(v, m) (__vx_state(v) & (m)) #define __nx_state(v) ((v) ? ((v)->nx_state) : 0) -#define nx_info_state(v,m) (__nx_state(v) & (m)) +#define nx_info_state(v, m) (__nx_state(v) & (m)) #endif diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/cacct_def.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/cacct_def.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/cacct_def.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/cacct_def.h 2007-06-13 09:47:21 +0200 @@ -22,14 +22,14 @@ struct _vx_cacct { static inline void __dump_vx_cacct(struct _vx_cacct *cacct) { - int i,j; + int i, j; printk("\t_vx_cacct:"); - for (i=0; i<6; i++) { + for (i = 0; i < 6; i++) { struct _vx_sock_acc *ptr = cacct->sock[i]; printk("\t [%d] =", i); - for (j=0; j<3; j++) { + for (j = 0; j < 3; j++) { printk(" [%d] = %8lu, %8lu", j, atomic_long_read(&ptr[j].count), atomic_long_read(&ptr[j].total)); diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/context.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/context.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/context.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/context.h 2007-06-13 08:58:36 +0200 @@ -32,22 +32,22 @@ #define VXF_HIDE_NETIF 0x02000000 #define VXF_HIDE_VINFO 0x04000000 -#define VXF_STATE_SETUP (1ULL<<32) -#define VXF_STATE_INIT (1ULL<<33) -#define VXF_STATE_ADMIN (1ULL<<34) +#define VXF_STATE_SETUP (1ULL << 32) +#define VXF_STATE_INIT (1ULL << 33) +#define VXF_STATE_ADMIN (1ULL << 34) -#define VXF_SC_HELPER (1ULL<<36) -#define VXF_REBOOT_KILL (1ULL<<37) -#define VXF_PERSISTENT (1ULL<<38) +#define VXF_SC_HELPER (1ULL << 36) +#define VXF_REBOOT_KILL (1ULL << 37) +#define VXF_PERSISTENT (1ULL << 38) -#define VXF_FORK_RSS (1ULL<<48) -#define VXF_PROLIFIC (1ULL<<49) +#define VXF_FORK_RSS (1ULL << 48) +#define VXF_PROLIFIC (1ULL << 49) -#define VXF_IGNEG_NICE (1ULL<<52) +#define VXF_IGNEG_NICE (1ULL << 52) -#define VXF_ONE_TIME (0x0007ULL<<32) +#define VXF_ONE_TIME (0x0007ULL << 32) -#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN) +#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) /* context migration */ diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/context_cmd.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/context_cmd.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/context_cmd.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/context_cmd.h 2007-06-13 09:47:35 +0200 @@ -108,7 +108,7 @@ extern int vc_set_ccaps(struct vx_info * /* bcaps commands */ #define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) -#define VCMD_set_bcaps VC_CMD(FLAGS,10, 0) +#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) struct vcmd_bcaps { uint64_t bcaps; diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/cvirt_cmd.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/cvirt_cmd.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/cvirt_cmd.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/cvirt_cmd.h 2007-06-13 07:51:01 +0200 @@ -14,7 +14,7 @@ struct vcmd_vhi_name_v0 { enum vhi_name_field { - VHIN_CONTEXT=0, + VHIN_CONTEXT = 0, VHIN_SYSNAME, VHIN_NODENAME, VHIN_RELEASE, diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/debug.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug.h 2007-03-10 18:02:51 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/debug.h 2007-06-13 09:00:36 +0200 @@ -2,14 +2,9 @@ #define _VX_DEBUG_H -#define VXD_CBIT(n,m) (vx_debug_ ## n & (1 << (m))) -#define VXD_CMIN(n,m) (vx_debug_ ## n > (m)) -#define VXD_MASK(n,m) (vx_debug_ ## n & (m)) - -#define VXD_QPOS(v,p) (((uint32_t)(v) >> ((p)*8)) & 0xFF) -#define VXD_QUAD(v) VXD_QPOS(v,0), VXD_QPOS(v,1), \ - VXD_QPOS(v,2), VXD_QPOS(v,3) -#define VXF_QUAD "%u.%u.%u.%u" +#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m))) +#define VXD_CMIN(n, m) (vx_debug_ ## n > (m)) +#define VXD_MASK(n, m) (vx_debug_ ## n & (m)) #define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \ imajor((d)->bd_inode), iminor((d)->bd_inode) @@ -19,9 +14,9 @@ #define __FUNC__ __func__ -#define vxd_path(d,m) \ +#define vxd_path(d, m) \ ({ static char _buffer[PATH_MAX]; \ - d_path((d), (m), _buffer, sizeof(_buffer)); }) + d_path(d, m, _buffer, sizeof(_buffer)); }) #define vxd_cond_path(n) \ ((n) ? vxd_path((n)->dentry, (n)->mnt) : "" ) @@ -44,19 +39,19 @@ extern unsigned int vx_debug_misc; #define VX_LOGLEVEL "vxD: " -#define vxdprintk(c,f,x...) \ +#define vxdprintk(c, f, x...) \ do { \ if (c) \ printk(VX_LOGLEVEL f "\n" , ##x); \ } while (0) -#define vxlprintk(c,f,x...) \ +#define vxlprintk(c, f, x...) \ do { \ if (c) \ printk(VX_LOGLEVEL f " @%s:%d\n", x); \ } while (0) -#define vxfprintk(c,f,x...) \ +#define vxfprintk(c, f, x...) \ do { \ if (c) \ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \ @@ -91,7 +86,7 @@ void dump_vx_info_inactive(int); #define VX_WARNLEVEL KERN_WARNING "vxW: " -#define vxwprintk(c,f,x...) \ +#define vxwprintk(c, f, x...) \ do { \ if (c) \ printk(VX_WARNLEVEL f "\n" , ##x); \ @@ -106,11 +101,11 @@ void dump_vx_info_inactive(int); #ifdef CONFIG_VSERVER_DEBUG #define vxd_assert_lock(l) assert_spin_locked(l) -#define vxd_assert(c,f,x...) vxlprintk(!(c), \ +#define vxd_assert(c, f, x...) vxlprintk(!(c), \ "assertion [" f "] failed.", ##x, __FILE__, __LINE__) #else #define vxd_assert_lock(l) do { } while (0) -#define vxd_assert(c,f,x...) do { } while (0) +#define vxd_assert(c, f, x...) do { } while (0) #endif diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/history.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/history.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/history.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/history.h 2007-06-13 09:04:26 +0200 @@ -3,8 +3,8 @@ enum { - VXH_UNUSED=0, - VXH_THROW_OOPS=1, + VXH_UNUSED = 0, + VXH_THROW_OOPS = 1, VXH_GET_VX_INFO, VXH_PUT_VX_INFO, @@ -128,20 +128,20 @@ void __vxh_throw_oops(void *__here) #define vxh_throw_oops() __vxh_throw_oops(__HERE__); -#define __vxh_get_vx_info(v,h) __vxh_smpl(v, VXH_GET_VX_INFO, h); -#define __vxh_put_vx_info(v,h) __vxh_smpl(v, VXH_PUT_VX_INFO, h); +#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h); +#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h); -#define __vxh_init_vx_info(v,d,h) \ - __vxh_data(v,d, VXH_INIT_VX_INFO, h); -#define __vxh_set_vx_info(v,d,h) \ - __vxh_data(v,d, VXH_SET_VX_INFO, h); -#define __vxh_clr_vx_info(v,d,h) \ - __vxh_data(v,d, VXH_CLR_VX_INFO, h); +#define __vxh_init_vx_info(v, d, h) \ + __vxh_data(v, d, VXH_INIT_VX_INFO, h); +#define __vxh_set_vx_info(v, d, h) \ + __vxh_data(v, d, VXH_SET_VX_INFO, h); +#define __vxh_clr_vx_info(v, d, h) \ + __vxh_data(v, d, VXH_CLR_VX_INFO, h); -#define __vxh_claim_vx_info(v,d,h) \ - __vxh_data(v,d, VXH_CLAIM_VX_INFO, h); -#define __vxh_release_vx_info(v,d,h) \ - __vxh_data(v,d, VXH_RELEASE_VX_INFO, h); +#define __vxh_claim_vx_info(v, d, h) \ + __vxh_data(v, d, VXH_CLAIM_VX_INFO, h); +#define __vxh_release_vx_info(v, d, h) \ + __vxh_data(v, d, VXH_RELEASE_VX_INFO, h); #define vxh_alloc_vx_info(v) \ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__); @@ -153,12 +153,12 @@ void __vxh_throw_oops(void *__here) #define vxh_unhash_vx_info(v) \ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__); -#define vxh_loc_vx_info(v,l) \ - __vxh_long(v,l, VXH_LOC_VX_INFO, __HERE__); -#define vxh_lookup_vx_info(v,l) \ - __vxh_long(v,l, VXH_LOOKUP_VX_INFO, __HERE__); -#define vxh_create_vx_info(v,l) \ - __vxh_long(v,l, VXH_CREATE_VX_INFO, __HERE__); +#define vxh_loc_vx_info(v, l) \ + __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__); +#define vxh_lookup_vx_info(v, l) \ + __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__); +#define vxh_create_vx_info(v, l) \ + __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__); extern void vxh_dump_history(void); @@ -169,15 +169,15 @@ extern void vxh_dump_history(void); #define vxh_throw_oops() do { } while (0) -#define __vxh_get_vx_info(v,h) do { } while (0) -#define __vxh_put_vx_info(v,h) do { } while (0) +#define __vxh_get_vx_info(v, h) do { } while (0) +#define __vxh_put_vx_info(v, h) do { } while (0) -#define __vxh_init_vx_info(v,d,h) do { } while (0) -#define __vxh_set_vx_info(v,d,h) do { } while (0) -#define __vxh_clr_vx_info(v,d,h) do { } while (0) +#define __vxh_init_vx_info(v, d, h) do { } while (0) +#define __vxh_set_vx_info(v, d, h) do { } while (0) +#define __vxh_clr_vx_info(v, d, h) do { } while (0) -#define __vxh_claim_vx_info(v,d,h) do { } while (0) -#define __vxh_release_vx_info(v,d,h) do { } while (0) +#define __vxh_claim_vx_info(v, d, h) do { } while (0) +#define __vxh_release_vx_info(v, d, h) do { } while (0) #define vxh_alloc_vx_info(v) do { } while (0) #define vxh_dealloc_vx_info(v) do { } while (0) @@ -185,9 +185,9 @@ extern void vxh_dump_history(void); #define vxh_hash_vx_info(v) do { } while (0) #define vxh_unhash_vx_info(v) do { } while (0) -#define vxh_loc_vx_info(a,v) do { } while (0) -#define vxh_lookup_vx_info(a,v) do { } while (0) -#define vxh_create_vx_info(a,v) do { } while (0) +#define vxh_loc_vx_info(v, l) do { } while (0) +#define vxh_lookup_vx_info(v, l) do { } while (0) +#define vxh_create_vx_info(v, l) do { } while (0) #define vxh_dump_history() do { } while (0) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/inode.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/inode.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/inode.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/inode.h 2007-06-13 09:05:00 +0200 @@ -24,7 +24,7 @@ #define IATTR_PROC_SYMLINK ( IATTR_ADMIN ) #endif -#define vx_hide_check(c,m) (((m) & IATTR_HIDE) ? vx_check(c,m) : 1) +#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) #endif /* __KERNEL__ */ diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/limit.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/limit.h 2007-06-13 09:08:22 +0200 @@ -24,27 +24,27 @@ #warning RLIM_INFINITY is undefined #endif -#define __rlim_val(l,r,v) ((l)->res[(r)].v) +#define __rlim_val(l, r, v) ((l)->res[r].v) -#define __rlim_soft(l,r) __rlim_val(l,r,soft) -#define __rlim_hard(l,r) __rlim_val(l,r,hard) +#define __rlim_soft(l, r) __rlim_val(l, r, soft) +#define __rlim_hard(l, r) __rlim_val(l, r, hard) -#define __rlim_rcur(l,r) __rlim_val(l,r,rcur) -#define __rlim_rmin(l,r) __rlim_val(l,r,rmin) -#define __rlim_rmax(l,r) __rlim_val(l,r,rmax) +#define __rlim_rcur(l, r) __rlim_val(l, r, rcur) +#define __rlim_rmin(l, r) __rlim_val(l, r, rmin) +#define __rlim_rmax(l, r) __rlim_val(l, r, rmax) -#define __rlim_lhit(l,r) __rlim_val(l,r,lhit) -#define __rlim_hit(l,r) atomic_inc(&__rlim_lhit(l,r)) +#define __rlim_lhit(l, r) __rlim_val(l, r, lhit) +#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r)) typedef atomic_long_t rlim_atomic_t; typedef unsigned long rlim_t; -#define __rlim_get(l,r) atomic_long_read(&__rlim_rcur(l,r)) -#define __rlim_set(l,r,v) atomic_long_set(&__rlim_rcur(l,r), v) -#define __rlim_inc(l,r) atomic_long_inc(&__rlim_rcur(l,r)) -#define __rlim_dec(l,r) atomic_long_dec(&__rlim_rcur(l,r)) -#define __rlim_add(l,r,v) atomic_long_add(v, &__rlim_rcur(l,r)) -#define __rlim_sub(l,r,v) atomic_long_sub(v, &__rlim_rcur(l,r)) +#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r)) +#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v) +#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r)) +#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r)) +#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r)) +#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r)) #if (RLIM_INFINITY == VLIM_INFINITY) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_def.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/limit_def.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_def.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/limit_def.h 2007-06-13 05:15:43 +0200 @@ -31,7 +31,7 @@ static inline void __dump_vx_limit(struc int i; printk("\t_vx_limit:"); - for (i=0; i 0) && (res != id)) continue; diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/network.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/network.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/network.h 2007-02-15 00:05:40 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/network.h 2007-06-13 09:09:31 +0200 @@ -15,13 +15,13 @@ #define NXF_INFO_PRIVATE 0x00000008 -#define NXF_STATE_SETUP (1ULL<<32) -#define NXF_STATE_ADMIN (1ULL<<34) +#define NXF_STATE_SETUP (1ULL << 32) +#define NXF_STATE_ADMIN (1ULL << 34) -#define NXF_SC_HELPER (1ULL<<36) -#define NXF_PERSISTENT (1ULL<<38) +#define NXF_SC_HELPER (1ULL << 36) +#define NXF_PERSISTENT (1ULL << 38) -#define NXF_ONE_TIME (0x0005ULL<<32) +#define NXF_ONE_TIME (0x0005ULL << 32) #define NXF_INIT_SET (NXF_STATE_ADMIN) @@ -31,7 +31,7 @@ #define NXA_TYPE_IPV4 1 #define NXA_TYPE_IPV6 2 -#define NXA_MOD_BCAST (1<<8) +#define NXA_MOD_BCAST (1 << 8) #define NXA_TYPE_ANY ((uint16_t)-1) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/switch.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/switch.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/switch.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/switch.h 2007-06-13 09:10:06 +0200 @@ -8,7 +8,7 @@ #define VC_COMMAND(c) (((c) >> 16) & 0xFF) #define VC_VERSION(c) ((c) & 0xFFF) -#define VC_CMD(c,i,v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ +#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) /* diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/tag.h linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/tag.h --- linux-2.6.20.14-vs2.2.0/include/linux/vserver/tag.h 2007-03-10 18:02:51 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/include/linux/vserver/tag.h 2007-06-13 09:45:38 +0200 @@ -87,7 +87,7 @@ #ifndef CONFIG_TAGGING_NONE #define dx_current_fstag(sb) \ - ((sb)->s_flags & MS_TAGGED ? dx_current_tag(): 0) + ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0) #else #define dx_current_fstag(sb) (0) #endif @@ -131,10 +131,10 @@ int dx_parse_tag(char *string, tag_t *ta void __dx_propagate_tag(struct nameidata *nd, struct inode *inode); -#define dx_propagate_tag(n,i) __dx_propagate_tag(n,i) +#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i) #else -#define dx_propagate_tag(n,i) do { } while (0) +#define dx_propagate_tag(n, i) do { } while (0) #endif #endif /* _DX_TAG_H */ diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct.c 2007-06-13 05:17:20 +0200 @@ -25,19 +25,19 @@ int vc_sock_stat(struct vx_info *vxi, vo struct vcmd_sock_stat_v0 vc_data; int j, field; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; field = vc_data.field; if ((field < 0) || (field >= VXA_SOCK_SIZE)) return -EINVAL; - for (j=0; j<3; j++) { + for (j = 0; j < 3; j++) { vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j); vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j); } - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_init.h linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct_init.h --- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_init.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct_init.h 2007-06-13 09:48:33 +0200 @@ -2,19 +2,19 @@ static inline void vx_info_init_cacct(struct _vx_cacct *cacct) { - int i,j; + int i, j; - for (i=0; isock[i][j].count, 0); atomic_set(&cacct->sock[i][j].total, 0); } } - for (i=0; i<8; i++) + for (i = 0; i < 8; i++) atomic_set(&cacct->slab[i], 0); - for (i=0; i<5; i++) - for (j=0; j<4; j++) + for (i = 0; i < 5; i++) + for (j = 0; j < 4; j++) atomic_set(&cacct->page[i][j], 0); } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_proc.h linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct_proc.h --- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_proc.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cacct_proc.h 2007-06-13 09:48:39 +0200 @@ -9,47 +9,43 @@ static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer) { - int i,j, length = 0; + int i, j, length = 0; static char *type[VXA_SOCK_SIZE] = { "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" }; length += sprintf(buffer + length, VX_SOCKA_TOP); - for (i=0; islab[1]) - ,atomic_read(&cacct->slab[4]) - ,atomic_read(&cacct->slab[0]) - ,atomic_read(&cacct->slab[2]) - ); + "slab:\t %8u %8u %8u %8u\n", + atomic_read(&cacct->slab[1]), + atomic_read(&cacct->slab[4]), + atomic_read(&cacct->slab[0]), + atomic_read(&cacct->slab[2])); length += sprintf(buffer + length, "\n"); - for (i=0; i<5; i++) { + for (i = 0; i < 5; i++) { length += sprintf(buffer + length, - "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n" - ,i - ,atomic_read(&cacct->page[i][0]) - ,atomic_read(&cacct->page[i][1]) - ,atomic_read(&cacct->page[i][2]) - ,atomic_read(&cacct->page[i][3]) - ,atomic_read(&cacct->page[i][4]) - ,atomic_read(&cacct->page[i][5]) - ,atomic_read(&cacct->page[i][6]) - ,atomic_read(&cacct->page[i][7]) - ); + "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i, + atomic_read(&cacct->page[i][0]), + atomic_read(&cacct->page[i][1]), + atomic_read(&cacct->page[i][2]), + atomic_read(&cacct->page[i][3]), + atomic_read(&cacct->page[i][4]), + atomic_read(&cacct->page[i][5]), + atomic_read(&cacct->page[i][6]), + atomic_read(&cacct->page[i][7])); } return length; diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/context.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/context.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/context.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/context.c 2007-06-13 09:57:54 +0200 @@ -79,7 +79,7 @@ static struct vx_info *__alloc_vx_info(x if (!new) return 0; - memset (new, 0, sizeof(struct vx_info)); + memset(new, 0, sizeof(struct vx_info)); #ifdef CONFIG_SMP new->ptr_pc = alloc_percpu(struct _vx_info_pc); if (!new->ptr_pc) @@ -301,7 +301,7 @@ static inline struct vx_info *__lookup_v found: vxdprintk(VXD_CBIT(xid, 0), "__lookup_vx_info(#%u): %p[#%u]", - xid, vxi, vxi?vxi->vx_id:0); + xid, vxi, vxi ? vxi->vx_id : 0); vxh_lookup_vx_info(vxi, xid); return vxi; } @@ -337,7 +337,7 @@ static inline xid_t __vx_dynamic_id(void * locate or create the requested context * get() it and if new hash it */ -static struct vx_info * __loc_vx_info(int id, int *err) +static struct vx_info *__loc_vx_info(int id, int *err) { struct vx_info *new, *vxi = NULL; @@ -404,7 +404,7 @@ out_unlock: * create the requested context * get(), claim() and hash it */ -static struct vx_info * __create_vx_info(int id) +static struct vx_info *__create_vx_info(int id) { struct vx_info *new, *vxi = NULL; @@ -461,7 +461,7 @@ static struct vx_info * __create_vx_info out_unlock: spin_unlock(&vx_info_hash_lock); - vxh_create_vx_info(IS_ERR(vxi)?NULL:vxi, id); + vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id); if (new) __dealloc_vx_info(new); return vxi; @@ -861,7 +861,7 @@ int vc_vx_info(struct vx_info *vxi, void vc_data.xid = vxi->vx_id; vc_data.initpid = vxi->vx_initpid; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -874,7 +874,7 @@ int vc_ctx_stat(struct vx_info *vxi, voi vc_data.usecnt = atomic_read(&vxi->vx_usecnt); vc_data.tasks = atomic_read(&vxi->vx_tasks); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -888,7 +888,7 @@ int vc_ctx_create(uint32_t xid, void __u struct vx_info *new_vxi; int ret; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; if ((xid > MAX_S_CONTEXT) && (xid != VX_DYNAMIC_ID)) @@ -929,7 +929,7 @@ int vc_ctx_migrate(struct vx_info *vxi, struct vcmd_ctx_migrate vc_data = { .flagword = 0 }; int ret; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = vx_migrate_task(current, vxi, 0); @@ -954,7 +954,7 @@ int vc_get_cflags(struct vx_info *vxi, v /* special STATE flag handling */ vc_data.mask = vs_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -964,7 +964,7 @@ int vc_set_cflags(struct vx_info *vxi, v struct vcmd_ctx_flags_v0 vc_data; uint64_t mask, trigger; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; /* special STATE flag handling */ @@ -1014,7 +1014,7 @@ int vc_get_ccaps_v0(struct vx_info *vxi, return ret; vc_data.cmask = ~0UL; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -1029,7 +1029,7 @@ int vc_get_ccaps(struct vx_info *vxi, vo return ret; vc_data.cmask = ~0UL; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -1047,7 +1047,7 @@ int vc_set_ccaps_v0(struct vx_info *vxi, { struct vcmd_ctx_caps_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; /* simulate old &= behaviour for bcaps */ @@ -1059,7 +1059,7 @@ int vc_set_ccaps(struct vx_info *vxi, vo { struct vcmd_ctx_caps_v1 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask); @@ -1075,7 +1075,7 @@ int vc_get_bcaps(struct vx_info *vxi, vo return ret; vc_data.bmask = ~0UL; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -1084,7 +1084,7 @@ int vc_set_bcaps(struct vx_info *vxi, vo { struct vcmd_bcaps vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0); diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cvirt.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cvirt.c 2007-06-13 09:58:15 +0200 @@ -164,7 +164,7 @@ int vx_do_syslog(int type, char __user * /* virtual host info names */ -static char * vx_vhi_name(struct vx_info *vxi, int id) +static char *vx_vhi_name(struct vx_info *vxi, int id) { struct nsproxy *nsproxy; struct uts_namespace *uts; @@ -205,7 +205,7 @@ int vc_set_vhi_name(struct vx_info *vxi, struct vcmd_vhi_name_v0 vc_data; char *name; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; name = vx_vhi_name(vxi, vc_data.field); @@ -221,7 +221,7 @@ int vc_get_vhi_name(struct vx_info *vxi, struct vcmd_vhi_name_v0 vc_data; char *name; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; name = vx_vhi_name(vxi, vc_data.field); @@ -229,7 +229,7 @@ int vc_get_vhi_name(struct vx_info *vxi, return -EINVAL; memcpy(vc_data.name, name, 65); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -257,7 +257,7 @@ int vc_virt_stat(struct vx_info *vxi, vo vc_data.load[1] = cvirt->load[1]; vc_data.load[2] = cvirt->load[2]; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt_proc.h linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cvirt_proc.h --- linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt_proc.h 2007-02-06 05:55:13 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/cvirt_proc.h 2007-06-13 09:11:05 +0200 @@ -37,9 +37,9 @@ int vx_info_proc_nsproxy(struct nsproxy root = d_path(mnt->mnt_root, mnt->mnt_parent, path, PATH_MAX-2); length += sprintf(buffer + length, "Namespace:\t%p [#%u]\n" - "RootPath:\t%s\n" - ,ns , atomic_read(&ns->count) - ,root); + "RootPath:\t%s\n", + ns, atomic_read(&ns->count), + root); kfree(path); skip_ns: @@ -53,14 +53,13 @@ skip_ns: "Release:\t%.*s\n" "Version:\t%.*s\n" "Machine:\t%.*s\n" - "DomainName:\t%.*s\n" - ,__NEW_UTS_LEN, uts->name.sysname - ,__NEW_UTS_LEN, uts->name.nodename - ,__NEW_UTS_LEN, uts->name.release - ,__NEW_UTS_LEN, uts->name.version - ,__NEW_UTS_LEN, uts->name.machine - ,__NEW_UTS_LEN, uts->name.domainname - ); + "DomainName:\t%.*s\n", + __NEW_UTS_LEN, uts->name.sysname, + __NEW_UTS_LEN, uts->name.nodename, + __NEW_UTS_LEN, uts->name.release, + __NEW_UTS_LEN, uts->name.version, + __NEW_UTS_LEN, uts->name.machine, + __NEW_UTS_LEN, uts->name.domainname); skip_uts: ipc = nsproxy->ipc_ns; @@ -70,17 +69,15 @@ skip_uts: length += sprintf(buffer + length, "SEMS:\t\t%d %d %d %d %d\n" "MSG:\t\t%d %d %d\n" - "SHM:\t\t%lu %lu %d %d\n" - ,ipc->sem_ctls[0], ipc->sem_ctls[1] - ,ipc->sem_ctls[2], ipc->sem_ctls[3] - ,ipc->used_sems - ,ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni - ,(unsigned long)ipc->shm_ctlmax - ,(unsigned long)ipc->shm_ctlall - ,ipc->shm_ctlmni, ipc->shm_tot - ); + "SHM:\t\t%lu %lu %d %d\n", + ipc->sem_ctls[0], ipc->sem_ctls[1], + ipc->sem_ctls[2], ipc->sem_ctls[3], + ipc->used_sems, + ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni, + (unsigned long)ipc->shm_ctlmax, + (unsigned long)ipc->shm_ctlall, + ipc->shm_ctlmni, ipc->shm_tot); skip_ipc: - out: return length; } @@ -89,7 +86,7 @@ out: #include #define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) +#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100) static inline int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer) @@ -99,8 +96,8 @@ int vx_info_proc_cvirt(struct _vx_cvirt length += sprintf(buffer + length, "BiasUptime:\t%lu.%02lu\n", - (unsigned long)cvirt->bias_uptime.tv_sec, - (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); + (unsigned long)cvirt->bias_uptime.tv_sec, + (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); a = cvirt->load[0] + (FIXED_1/200); b = cvirt->load[1] + (FIXED_1/200); @@ -112,17 +109,16 @@ int vx_info_proc_cvirt(struct _vx_cvirt "nr_onhold:\t%d\n" "load_updates:\t%d\n" "loadavg:\t%d.%02d %d.%02d %d.%02d\n" - "total_forks:\t%d\n" - ,atomic_read(&cvirt->nr_threads) - ,atomic_read(&cvirt->nr_running) - ,atomic_read(&cvirt->nr_uninterruptible) - ,atomic_read(&cvirt->nr_onhold) - ,atomic_read(&cvirt->load_updates) - ,LOAD_INT(a), LOAD_FRAC(a) - ,LOAD_INT(b), LOAD_FRAC(b) - ,LOAD_INT(c), LOAD_FRAC(c) - ,atomic_read(&cvirt->total_forks) - ); + "total_forks:\t%d\n", + atomic_read(&cvirt->nr_threads), + atomic_read(&cvirt->nr_running), + atomic_read(&cvirt->nr_uninterruptible), + atomic_read(&cvirt->nr_onhold), + atomic_read(&cvirt->load_updates), + LOAD_INT(a), LOAD_FRAC(a), + LOAD_INT(b), LOAD_FRAC(b), + LOAD_INT(c), LOAD_FRAC(c), + atomic_read(&cvirt->total_forks)); return length; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/dlimit.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/dlimit.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/dlimit.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/dlimit.c 2007-06-13 06:34:15 +0200 @@ -41,7 +41,7 @@ static struct dl_info *__alloc_dl_info(s if (!new) return 0; - memset (new, 0, sizeof(struct dl_info)); + memset(new, 0, sizeof(struct dl_info)); new->dl_tag = tag; new->dl_sb = sb; INIT_RCU_HEAD(&new->dl_rcu); @@ -230,7 +230,7 @@ int vc_add_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_base_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1); @@ -240,7 +240,7 @@ int vc_rem_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_base_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0); @@ -252,7 +252,7 @@ int vc_add_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_base_v0_x32 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_addrem_dlimit(id, @@ -263,7 +263,7 @@ int vc_rem_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_base_v0_x32 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_addrem_dlimit(id, @@ -339,7 +339,7 @@ int vc_set_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_dlimit(id, vc_data.name, @@ -354,7 +354,7 @@ int vc_set_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_v0_x32 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_dlimit(id, compat_ptr(vc_data.name_ptr), @@ -419,7 +419,7 @@ int vc_get_dlimit(uint32_t id, void __us struct vcmd_ctx_dlimit_v0 vc_data; int ret; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_get_dlimit(id, vc_data.name, @@ -441,7 +441,7 @@ int vc_get_dlimit_x32(uint32_t id, void struct vcmd_ctx_dlimit_v0_x32 vc_data; int ret; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr), diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/helper.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/helper.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/helper.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/helper.c 2007-06-13 09:58:42 +0200 @@ -32,11 +32,11 @@ static int do_vshelper(char *name, char printk( KERN_WARNING "%s: (%s %s) returned %s with %d\n", name, argv[1], argv[2], - sync?"sync":"async", ret); + sync ? "sync" : "async", ret); } vxdprintk(VXD_CBIT(switch, 4), "%s: (%s %s) returned %s with %d", - name, argv[1], argv[2], sync?"sync":"async", ret); + name, argv[1], argv[2], sync ? "sync" : "async", ret); return ret; } @@ -106,14 +106,14 @@ long vs_reboot_helper(struct vx_info *vx } -long vs_reboot(unsigned int cmd, void __user * arg) +long vs_reboot(unsigned int cmd, void __user *arg) { struct vx_info *vxi = current->vx_info; long ret = 0; vxdprintk(VXD_CBIT(misc, 5), "vs_reboot(%p[#%d],%d)", - vxi, vxi?vxi->vx_id:0, cmd); + vxi, vxi ? vxi->vx_id : 0, cmd); ret = vs_reboot_helper(vxi, cmd, arg); if (ret) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/history.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/history.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/history.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/history.c 2007-06-13 09:32:55 +0200 @@ -75,10 +75,10 @@ EXPORT_SYMBOL_GPL(vxh_advance); #define VXH_VXI_FMTS "%p[#%d,%d.%d]" -#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \ - (e)->vxi.ptr?(e)->vxi.xid:0, \ - (e)->vxi.ptr?(e)->vxi.usecnt:0, \ - (e)->vxi.ptr?(e)->vxi.tasks:0 +#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \ + (e)->vxi.ptr ? (e)->vxi.xid : 0, \ + (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \ + (e)->vxi.ptr ? (e)->vxi.tasks : 0 void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu) { @@ -91,7 +91,7 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_PUT_VX_INFO: printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", VXH_LOC_ARGS(e), - (e->type==VXH_GET_VX_INFO)?"get":"put", + (e->type == VXH_GET_VX_INFO) ? "get" : "put", VXH_VXI_ARGS(e)); break; @@ -100,8 +100,8 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_CLR_VX_INFO: printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", VXH_LOC_ARGS(e), - (e->type==VXH_INIT_VX_INFO)?"init": - ((e->type==VXH_SET_VX_INFO)?"set":"clr"), + (e->type == VXH_INIT_VX_INFO) ? "init" : + ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"), VXH_VXI_ARGS(e), e->sc.data); break; @@ -109,7 +109,7 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_RELEASE_VX_INFO: printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", VXH_LOC_ARGS(e), - (e->type==VXH_CLAIM_VX_INFO)?"claim":"release", + (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release", VXH_VXI_ARGS(e), e->sc.data); break; @@ -117,7 +117,7 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_DEALLOC_VX_INFO: printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", VXH_LOC_ARGS(e), - (e->type==VXH_ALLOC_VX_INFO)?"alloc":"dealloc", + (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc", VXH_VXI_ARGS(e)); break; @@ -125,7 +125,7 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_UNHASH_VX_INFO: printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n", VXH_LOC_ARGS(e), - (e->type==VXH_HASH_VX_INFO)?"hash":"unhash", + (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash", VXH_VXI_ARGS(e)); break; @@ -134,8 +134,8 @@ void vxh_dump_entry(struct _vx_hist_entr case VXH_CREATE_VX_INFO: printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n", VXH_LOC_ARGS(e), - (e->type==VXH_CREATE_VX_INFO)?"create": - ((e->type==VXH_LOC_VX_INFO)?"loc":"lookup"), + (e->type == VXH_CREATE_VX_INFO) ? "create" : + ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"), e->ll.arg, VXH_VXI_ARGS(e)); break; } @@ -148,7 +148,7 @@ static void __vxh_dump_history(void) printk("History:\tSEQ: %8x\tNR_CPUS: %d\n", atomic_read(&sequence), NR_CPUS); - for (i=0; i < VXH_SIZE; i++) { + for (i = 0; i < VXH_SIZE; i++) { for_each_online_cpu(cpu) { struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); @@ -209,7 +209,7 @@ int do_read_history(struct __user _vx_hi &hist->entry[idx % VXH_SIZE]; /* send entry to userspace */ - ret = copy_to_user (&data[pos], entry, sizeof(*entry)); + ret = copy_to_user(&data[pos], entry, sizeof(*entry)); if (ret) break; } @@ -227,13 +227,13 @@ int vc_read_history(uint32_t id, void __ if (id >= NR_CPUS) return -EINVAL; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data, id, &vc_data.index, &vc_data.count); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return ret; } @@ -248,14 +248,14 @@ int vc_read_history_x32(uint32_t id, voi if (id >= NR_CPUS) return -EINVAL; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_read_history((struct __user _vx_hist_entry *) compat_ptr(vc_data.data_ptr), id, &vc_data.index, &vc_data.count); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return ret; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/inode.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/inode.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/inode.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/inode.c 2007-06-13 09:59:00 +0200 @@ -76,7 +76,7 @@ int vc_get_iattr(uint32_t id, void __use struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 }; int ret; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = user_path_walk_link(vc_data.name, &nd); @@ -88,7 +88,7 @@ int vc_get_iattr(uint32_t id, void __use if (ret) return ret; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) ret = -EFAULT; return ret; } @@ -103,7 +103,7 @@ int vc_get_iattr_x32(uint32_t id, void _ if (!vx_check(0, VS_ADMIN)) return -ENOSYS; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd); @@ -115,7 +115,7 @@ int vc_get_iattr_x32(uint32_t id, void _ if (ret) return ret; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) ret = -EFAULT; return ret; } @@ -207,7 +207,7 @@ int vc_set_iattr(uint32_t id, void __use if (!capable(CAP_LINUX_IMMUTABLE)) return -EPERM; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = user_path_walk_link(vc_data.name, &nd); @@ -217,7 +217,7 @@ int vc_set_iattr(uint32_t id, void __use path_release(&nd); } - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) ret = -EFAULT; return ret; } @@ -232,7 +232,7 @@ int vc_set_iattr_x32(uint32_t id, void _ if (!capable(CAP_LINUX_IMMUTABLE)) return -EPERM; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd); @@ -242,7 +242,7 @@ int vc_set_iattr_x32(uint32_t id, void _ path_release(&nd); } - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) ret = -EFAULT; return ret; } @@ -253,7 +253,7 @@ int vc_set_iattr_x32(uint32_t id, void _ #define PROC_DYNAMIC_FIRST 0xF0000000UL -int vx_proc_ioctl(struct inode * inode, struct file * filp, +int vx_proc_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { struct proc_dir_entry *entry; @@ -355,7 +355,7 @@ void __dx_propagate_tag(struct nameidata vxdprintk(VXD_CBIT(tag, 7), "dx_propagate_tag(%p[#%lu.%d]): %d,%d", inode, inode->i_ino, inode->i_tag, - new_tag, (propagate)?1:0); + new_tag, (propagate) ? 1 : 0); if (propagate) inode->i_tag = new_tag; diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/legacynet.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/legacynet.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/legacynet.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/legacynet.c 2007-06-13 06:34:56 +0200 @@ -34,7 +34,7 @@ int vc_set_ipv4root(uint32_t nbip, void if (nbip < 0 || nbip > NB_IPV4ROOT) return -EINVAL; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; if (!nxi || nxi->ipv4[0] == 0 || capable(CAP_NET_ADMIN)) @@ -46,10 +46,10 @@ int vc_set_ipv4root(uint32_t nbip, void /* We are allowed to select a subset of the currently installed IP numbers. No new one are allowed We can't change the broadcast address though */ - for (i=0; inbipv4; j++) { + for (j = 0; j < nxi->nbipv4; j++) { if (nxip == nxi->ipv4[j]) { found++; break; @@ -68,7 +68,7 @@ int vc_set_ipv4root(uint32_t nbip, void return -EINVAL; new_nxi->nbipv4 = nbip; - for (i=0; iipv4[i] = vc_data.nx_mask_pair[i].ip; new_nxi->mask[i] = vc_data.nx_mask_pair[i].mask; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/limit.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/limit.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/limit.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/limit.c 2007-06-13 06:54:24 +0200 @@ -121,7 +121,7 @@ int vc_get_rlimit(struct vx_info *vxi, v struct vcmd_ctx_rlimit_v0 vc_data; int ret; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_get_rlimit(vxi, vc_data.id, @@ -129,7 +129,7 @@ int vc_get_rlimit(struct vx_info *vxi, v if (ret) return ret; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -156,7 +156,7 @@ int vc_set_rlimit(struct vx_info *vxi, v { struct vcmd_ctx_rlimit_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_rlimit(vxi, vc_data.id, @@ -169,7 +169,7 @@ int vc_set_rlimit_x32(struct vx_info *vx { struct vcmd_ctx_rlimit_v0_x32 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_rlimit(vxi, vc_data.id, @@ -181,7 +181,7 @@ int vc_get_rlimit_x32(struct vx_info *vx struct vcmd_ctx_rlimit_v0_x32 vc_data; int ret; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_get_rlimit(vxi, vc_data.id, @@ -189,7 +189,7 @@ int vc_get_rlimit_x32(struct vx_info *vx if (ret) return ret; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -210,7 +210,7 @@ static inline void vx_reset_minmax(struc rlim_t value; int lim; - for (lim=0; limlimit; int id; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; id = vc_data.id; @@ -244,7 +244,7 @@ int vc_rlimit_stat(struct vx_info *vxi, vc_data.minimum = __rlim_rmin(limit, id); vc_data.maximum = __rlim_rmax(limit, id); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_init.h linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/limit_init.h --- linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_init.h 2007-03-10 18:02:51 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/limit_init.h 2007-06-13 05:23:20 +0200 @@ -4,7 +4,7 @@ static inline void vx_info_init_limit(st { int lim; - for (lim=0; limentry[idx % VXM_SIZE]; /* send entry to userspace */ - ret = copy_to_user (&data[pos], entry, sizeof(*entry)); + ret = copy_to_user(&data[pos], entry, sizeof(*entry)); if (ret) break; } @@ -105,13 +105,13 @@ int vc_read_monitor(uint32_t id, void __ if (id >= NR_CPUS) return -EINVAL; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data, id, &vc_data.index, &vc_data.count); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return ret; } @@ -126,14 +126,14 @@ int vc_read_monitor_x32(uint32_t id, voi if (id >= NR_CPUS) return -EINVAL; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; ret = do_read_monitor((struct __user _vx_mon_entry *) compat_ptr(vc_data.data_ptr), id, &vc_data.index, &vc_data.count); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return ret; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/network.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/network.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/network.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/network.c 2007-06-13 09:59:26 +0200 @@ -44,7 +44,7 @@ static struct nx_info *__alloc_nx_info(n if (!new) return 0; - memset (new, 0, sizeof(struct nx_info)); + memset(new, 0, sizeof(struct nx_info)); new->nx_id = nid; INIT_HLIST_NODE(&new->nx_hlist); atomic_set(&new->nx_usecnt, 0); @@ -187,7 +187,7 @@ static inline struct nx_info *__lookup_n found: vxdprintk(VXD_CBIT(nid, 0), "__lookup_nx_info(#%u): %p[#%u]", - nid, nxi, nxi?nxi->nx_id:0); + nid, nxi, nxi ? nxi->nx_id : 0); return nxi; } @@ -220,7 +220,7 @@ static inline nid_t __nx_dynamic_id(void * create the requested context * get(), claim() and hash it */ -static struct nx_info * __create_nx_info(int id) +static struct nx_info *__create_nx_info(int id) { struct nx_info *new, *nxi = NULL; @@ -488,9 +488,9 @@ static inline int __addr_in_socket(const uint32_t saddr = inet_rcv_saddr(sk); vxdprintk(VXD_CBIT(net, 5), - "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx", - sk, VXD_QUAD(addr), nxi, VXD_QUAD(saddr), sk->sk_socket, - (sk->sk_socket?sk->sk_socket->flags:0)); + "__addr_in_socket(%p," NIPQUAD_FMT ") %p:" NIPQUAD_FMT " %p;%lx", + sk, NIPQUAD(addr), nxi, NIPQUAD(saddr), sk->sk_socket, + (sk->sk_socket ? sk->sk_socket->flags : 0)); if (saddr) { /* direct address match */ @@ -508,8 +508,8 @@ static inline int __addr_in_socket(const int nx_addr_conflict(struct nx_info *nxi, uint32_t addr, const struct sock *sk) { vxdprintk(VXD_CBIT(net, 2), - "nx_addr_conflict(%p,%p) %d.%d,%d.%d", - nxi, sk, VXD_QUAD(addr)); + "nx_addr_conflict(%p,%p) " NIPQUAD_FMT, + nxi, sk, NIPQUAD(addr)); if (addr) { /* check real address */ @@ -518,7 +518,7 @@ int nx_addr_conflict(struct nx_info *nxi /* check against nx_info */ int i, n = nxi->nbipv4; - for (i=0; iipv4[i])) return 1; return 0; @@ -590,7 +590,7 @@ int vc_nx_info(struct nx_info *nxi, void vc_data.nid = nxi->nx_id; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -604,7 +604,7 @@ int vc_net_create(uint32_t nid, void __u struct nx_info *new_nxi; int ret; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; if ((nid > MAX_S_CONTEXT) && (nid != NX_DYNAMIC_ID)) @@ -650,7 +650,7 @@ int vc_net_add(struct nx_info *nxi, void struct vcmd_net_addr_v0 vc_data; int index, pos, ret = 0; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; switch (vc_data.type) { @@ -688,11 +688,11 @@ int vc_net_add(struct nx_info *nxi, void return ret; } -int vc_net_remove(struct nx_info * nxi, void __user *data) +int vc_net_remove(struct nx_info *nxi, void __user *data) { struct vcmd_net_addr_v0 vc_data; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; switch (vc_data.type) { @@ -715,7 +715,7 @@ int vc_get_nflags(struct nx_info *nxi, v /* special STATE flag handling */ vc_data.mask = vs_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -725,7 +725,7 @@ int vc_set_nflags(struct nx_info *nxi, v struct vcmd_net_flags_v0 vc_data; uint64_t mask, trigger; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; /* special STATE flag handling */ @@ -747,7 +747,7 @@ int vc_get_ncaps(struct nx_info *nxi, vo vc_data.ncaps = nxi->nx_ncaps; vc_data.cmask = ~0UL; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -756,7 +756,7 @@ int vc_set_ncaps(struct nx_info *nxi, vo { struct vcmd_net_caps_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps, diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/proc.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/proc.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/proc.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/proc.c 2007-06-13 10:00:36 +0200 @@ -48,12 +48,11 @@ static int proc_vci(char *buffer) return sprintf(buffer, "VCIVersion:\t%04x:%04x\n" "VCISyscall:\t%d\n" - "VCIKernel:\t%08x\n" - ,VCI_VERSION >> 16 - ,VCI_VERSION & 0xFFFF - ,__NR_vserver - ,vci_kernel_config() - ); + "VCIKernel:\t%08x\n", + VCI_VERSION >> 16, + VCI_VERSION & 0xFFFF, + __NR_vserver, + vci_kernel_config()); } static int proc_virtual_info(char *buffer) @@ -66,34 +65,32 @@ static int proc_virtual_status(char *buf return sprintf(buffer, "#CTotal:\t%d\n" "#CActive:\t%d\n" - "#NSProxy:\t%d\t%d %d %d %d\n" - ,atomic_read(&vx_global_ctotal) - ,atomic_read(&vx_global_cactive) - ,atomic_read(&vs_global_nsproxy) - ,atomic_read(&vs_global_fs) - ,atomic_read(&vs_global_mnt_ns) - ,atomic_read(&vs_global_uts_ns) - ,atomic_read(&vs_global_ipc_ns) - ); + "#NSProxy:\t%d\t%d %d %d %d\n", + atomic_read(&vx_global_ctotal), + atomic_read(&vx_global_cactive), + atomic_read(&vs_global_nsproxy), + atomic_read(&vs_global_fs), + atomic_read(&vs_global_mnt_ns), + atomic_read(&vs_global_uts_ns), + atomic_read(&vs_global_ipc_ns)); } -int proc_vxi_info (struct vx_info *vxi, char *buffer) +int proc_vxi_info(struct vx_info *vxi, char *buffer) { int length; length = sprintf(buffer, "ID:\t%d\n" "Info:\t%p\n" - "Init:\t%d\n" - ,vxi->vx_id - ,vxi - ,vxi->vx_initpid - ); + "Init:\t%d\n", + vxi->vx_id, + vxi, + vxi->vx_initpid); return length; } -int proc_vxi_status (struct vx_info *vxi, char *buffer) +int proc_vxi_status(struct vx_info *vxi, char *buffer) { int length; @@ -103,23 +100,22 @@ int proc_vxi_status (struct vx_info *vxi "Flags:\t%016llx\n" "BCaps:\t%016llx\n" "CCaps:\t%016llx\n" - "Spaces:\t%08lx\n" - ,atomic_read(&vxi->vx_usecnt) - ,atomic_read(&vxi->vx_tasks) - ,(unsigned long long)vxi->vx_flags - ,(unsigned long long)vxi->vx_bcaps - ,(unsigned long long)vxi->vx_ccaps - ,vxi->vx_nsmask - ); + "Spaces:\t%08lx\n", + atomic_read(&vxi->vx_usecnt), + atomic_read(&vxi->vx_tasks), + (unsigned long long)vxi->vx_flags, + (unsigned long long)vxi->vx_bcaps, + (unsigned long long)vxi->vx_ccaps, + vxi->vx_nsmask); return length; } -int proc_vxi_limit (struct vx_info *vxi, char *buffer) +int proc_vxi_limit(struct vx_info *vxi, char *buffer) { return vx_info_proc_limit(&vxi->limit, buffer); } -int proc_vxi_sched (struct vx_info *vxi, char *buffer) +int proc_vxi_sched(struct vx_info *vxi, char *buffer) { int cpu, length; @@ -132,12 +128,12 @@ int proc_vxi_sched (struct vx_info *vxi, return length; } -int proc_vxi_nsproxy (struct vx_info *vxi, char *buffer) +int proc_vxi_nsproxy(struct vx_info *vxi, char *buffer) { return vx_info_proc_nsproxy(vxi->vx_nsproxy, buffer); } -int proc_vxi_cvirt (struct vx_info *vxi, char *buffer) +int proc_vxi_cvirt(struct vx_info *vxi, char *buffer) { int cpu, length; @@ -151,7 +147,7 @@ int proc_vxi_cvirt (struct vx_info *vxi, return length; } -int proc_vxi_cacct (struct vx_info *vxi, char *buffer) +int proc_vxi_cacct(struct vx_info *vxi, char *buffer) { return vx_info_proc_cacct(&vxi->cacct, buffer); } @@ -166,23 +162,21 @@ static int proc_virtnet_status(char *buf { return sprintf(buffer, "#CTotal:\t%d\n" - "#CActive:\t%d\n" - ,atomic_read(&nx_global_ctotal) - ,atomic_read(&nx_global_cactive) - ); + "#CActive:\t%d\n", + atomic_read(&nx_global_ctotal), + atomic_read(&nx_global_cactive)); } -int proc_nxi_info (struct nx_info *nxi, char *buffer) +int proc_nxi_info(struct nx_info *nxi, char *buffer) { int length, i; length = sprintf(buffer, "ID:\t%d\n" - "Info:\t%p\n" - ,nxi->nx_id - ,nxi - ); - for (i=0; inbipv4; i++) { + "Info:\t%p\n", + nxi->nx_id, + nxi); + for (i = 0; i < nxi->nbipv4; i++) { length += sprintf(buffer + length, "%d:\t" NIPQUAD_FMT "/" NIPQUAD_FMT "\n", i, NIPQUAD(nxi->ipv4[i]), NIPQUAD(nxi->mask[i])); @@ -190,7 +184,7 @@ int proc_nxi_info (struct nx_info *nxi, return length; } -int proc_nxi_status (struct nx_info *nxi, char *buffer) +int proc_nxi_status(struct nx_info *nxi, char *buffer) { int length; @@ -198,12 +192,11 @@ int proc_nxi_status (struct nx_info *nxi "UseCnt:\t%d\n" "Tasks:\t%d\n" "Flags:\t%016llx\n" - "NCaps:\t%016llx\n" - ,atomic_read(&nxi->nx_usecnt) - ,atomic_read(&nxi->nx_tasks) - ,(unsigned long long)nxi->nx_flags - ,(unsigned long long)nxi->nx_ncaps - ); + "NCaps:\t%016llx\n", + atomic_read(&nxi->nx_usecnt), + atomic_read(&nxi->nx_tasks), + (unsigned long long)nxi->nx_flags, + (unsigned long long)nxi->nx_ncaps); return length; } @@ -330,7 +323,7 @@ struct vx_info *get_proc_vx_info(struct return lookup_vx_info(PROC_I(inode)->fd); } -static int proc_xid_revalidate(struct dentry * dentry, struct nameidata *nd) +static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd) { struct inode *inode = dentry->d_inode; xid_t xid = PROC_I(inode)->fd; @@ -344,7 +337,7 @@ static int proc_xid_revalidate(struct de /* get and revalidate nx_info/nid */ -static int proc_nid_revalidate(struct dentry * dentry, struct nameidata *nd) +static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd) { struct inode *inode = dentry->d_inode; nid_t nid = PROC_I(inode)->fd; @@ -359,7 +352,7 @@ static int proc_nid_revalidate(struct de #define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) -static ssize_t proc_vs_info_read(struct file * file, char __user * buf, +static ssize_t proc_vs_info_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { struct inode *inode = file->f_dentry->d_inode; @@ -386,7 +379,7 @@ static ssize_t proc_vs_info_read(struct return length; } -static ssize_t proc_vx_info_read(struct file * file, char __user * buf, +static ssize_t proc_vx_info_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { struct inode *inode = file->f_dentry->d_inode; @@ -422,7 +415,7 @@ out: return length; } -static ssize_t proc_nx_info_read(struct file * file, char __user * buf, +static ssize_t proc_nx_info_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { struct inode *inode = file->f_dentry->d_inode; @@ -474,22 +467,22 @@ out: #define DIR(NAME, MODE, OTYPE) \ - NOD(NAME, (S_IFDIR|(MODE)), \ - &proc_##OTYPE##_inode_operations, \ - &proc_##OTYPE##_file_operations, { } ) + NOD(NAME, (S_IFDIR | (MODE)), \ + &proc_ ## OTYPE ## _inode_operations, \ + &proc_ ## OTYPE ## _file_operations, { } ) #define INF(NAME, MODE, OTYPE) \ - NOD(NAME, (S_IFREG|(MODE)), NULL, \ + NOD(NAME, (S_IFREG | (MODE)), NULL, \ &proc_vs_info_file_operations, \ { .proc_vs_read = &proc_##OTYPE } ) #define VINF(NAME, MODE, OTYPE) \ - NOD(NAME, (S_IFREG|(MODE)), NULL, \ + NOD(NAME, (S_IFREG | (MODE)), NULL, \ &proc_vx_info_file_operations, \ { .proc_vxi_read = &proc_##OTYPE } ) #define NINF(NAME, MODE, OTYPE) \ - NOD(NAME, (S_IFREG|(MODE)), NULL, \ + NOD(NAME, (S_IFREG | (MODE)), NULL, \ &proc_nx_info_file_operations, \ { .proc_nxi_read = &proc_##OTYPE } ) @@ -547,8 +540,8 @@ out: return error; } -static int proc_xid_readdir(struct file * filp, - void * dirent, filldir_t filldir) +static int proc_xid_readdir(struct file *filp, + void *dirent, filldir_t filldir) { struct dentry *dentry = filp->f_dentry; struct inode *inode = dentry->d_inode; @@ -631,8 +624,8 @@ out: return error; } -static int proc_nid_readdir(struct file * filp, - void * dirent, filldir_t filldir) +static int proc_nid_readdir(struct file *filp, + void *dirent, filldir_t filldir) { struct dentry *dentry = filp->f_dentry; struct inode *inode = dentry->d_inode; @@ -672,7 +665,7 @@ out: } -#define MAX_MULBY10 ((~0U-9)/10) +#define MAX_MULBY10 ((~0U - 9) / 10) static inline int atovid(const char *str, int len) { @@ -786,8 +779,8 @@ out: #define PROC_NUMBUF 10 #define PROC_MAXVIDS 32 -int proc_virtual_readdir(struct file * filp, - void * dirent, filldir_t filldir) +int proc_virtual_readdir(struct file *filp, + void *dirent, filldir_t filldir) { struct dentry *dentry = filp->f_dentry; struct inode *inode = dentry->d_inode; @@ -869,8 +862,8 @@ static struct inode_operations proc_virt -int proc_virtnet_readdir(struct file * filp, - void * dirent, filldir_t filldir) +int proc_virtnet_readdir(struct file *filp, + void *dirent, filldir_t filldir) { struct dentry *dentry = filp->f_dentry; struct inode *inode = dentry->d_inode; @@ -978,22 +971,21 @@ void proc_vx_init(void) int proc_pid_vx_info(struct task_struct *p, char *buffer) { struct vx_info *vxi; - char * orig = buffer; + char *orig = buffer; - buffer += sprintf (buffer,"XID:\t%d\n", vx_task_xid(p)); + buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p)); vxi = task_get_vx_info(p); if (!vxi) goto out; - buffer += sprintf (buffer,"BCaps:\t%016llx\n" - ,(unsigned long long)vxi->vx_bcaps); - buffer += sprintf (buffer,"CCaps:\t%016llx\n" - ,(unsigned long long)vxi->vx_ccaps); - buffer += sprintf (buffer,"CFlags:\t%016llx\n" - ,(unsigned long long)vxi->vx_flags); - buffer += sprintf (buffer,"CIPid:\t%d\n" - ,vxi->vx_initpid); + buffer += sprintf(buffer, "BCaps:\t%016llx\n", + (unsigned long long)vxi->vx_bcaps); + buffer += sprintf(buffer, "CCaps:\t%016llx\n", + (unsigned long long)vxi->vx_ccaps); + buffer += sprintf(buffer, "CFlags:\t%016llx\n", + (unsigned long long)vxi->vx_flags); + buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid); put_vx_info(vxi); out: @@ -1004,29 +996,29 @@ out: int proc_pid_nx_info(struct task_struct *p, char *buffer) { struct nx_info *nxi; - char * orig = buffer; + char *orig = buffer; int i; - buffer += sprintf (buffer,"NID:\t%d\n", nx_task_nid(p)); + buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p)); nxi = task_get_nx_info(p); if (!nxi) goto out; - buffer += sprintf (buffer,"NCaps:\t%016llx\n" - ,(unsigned long long)nxi->nx_ncaps); - buffer += sprintf (buffer,"NFlags:\t%016llx\n" - ,(unsigned long long)nxi->nx_flags); + buffer += sprintf(buffer, "NCaps:\t%016llx\n", + (unsigned long long)nxi->nx_ncaps); + buffer += sprintf(buffer, "NFlags:\t%016llx\n", + (unsigned long long)nxi->nx_flags); - for (i=0; inbipv4; i++){ - buffer += sprintf (buffer, - "V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i - ,NIPQUAD(nxi->ipv4[i]) - ,NIPQUAD(nxi->mask[i])); + for (i = 0; i < nxi->nbipv4; i++){ + buffer += sprintf(buffer, + "V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i, + NIPQUAD(nxi->ipv4[i]), + NIPQUAD(nxi->mask[i])); } - buffer += sprintf (buffer, - "V4Root[bcast]:\t%d.%d.%d.%d\n" - ,NIPQUAD(nxi->v4_bcast)); + buffer += sprintf(buffer, + "V4Root[bcast]:\t%d.%d.%d.%d\n", + NIPQUAD(nxi->v4_bcast)); put_nx_info(nxi); out: diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sched.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sched.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/sched.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sched.c 2007-06-13 09:53:22 +0200 @@ -20,7 +20,7 @@ #include #define vxd_check_range(val, min, max) do { \ - vxlprintk((valmax), \ + vxlprintk((val < min) || (val > max), \ "check_range(%ld,%ld,%ld)", \ (long)val, (long)min, (long)max, \ __FILE__, __LINE__); \ @@ -256,7 +256,7 @@ static int do_set_sched(struct vx_info * vxi->sched.prio_bias = data->prio_bias; /* Sanity check rate/interval */ - for (i=0; i<2; i++) { + for (i = 0; i < 2; i++) { if (data->fill_rate[i] < 0) data->fill_rate[i] = 0; if (data->interval[i] <= 0) @@ -327,7 +327,7 @@ int vc_set_sched_v2(struct vx_info *vxi, struct vcmd_set_sched_v2 vc_data; struct vcmd_set_sched_v4 vc_data_v4 = { .set_mask = 0 }; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; COPY_MASK_V2(fill_rate, VXSM_FILL_RATE); @@ -347,7 +347,7 @@ int vc_set_sched_v3(struct vx_info *vxi, struct vcmd_set_sched_v3 vc_data; struct vcmd_set_sched_v4 vc_data_v4; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; /* structures are binary compatible */ @@ -362,7 +362,7 @@ int vc_set_sched_v4(struct vx_info *vxi, { struct vcmd_set_sched_v4 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_sched_v4(vxi, &vc_data); @@ -374,7 +374,7 @@ int vc_set_sched(struct vx_info *vxi, vo { struct vcmd_sched_v5 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return do_set_sched(vxi, &vc_data); @@ -385,7 +385,7 @@ int vc_get_sched(struct vx_info *vxi, vo { struct vcmd_sched_v5 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; if (vc_data.mask & VXSM_CPU_ID) { @@ -415,7 +415,7 @@ int vc_get_sched(struct vx_info *vxi, vo vc_data.interval[1] = ticks_to_msec(vc_data.interval[1]); } - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } @@ -426,7 +426,7 @@ int vc_sched_info(struct vx_info *vxi, v struct vcmd_sched_info vc_data; int cpu; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; cpu = vc_data.cpu_id; @@ -444,7 +444,7 @@ int vc_sched_info(struct vx_info *vxi, v } vc_data.token_usec = ticks_to_usec(1); - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) return -EFAULT; return 0; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sched_proc.h linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sched_proc.h --- linux-2.6.20.14-vs2.2.0/kernel/vserver/sched_proc.h 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sched_proc.h 2007-06-13 04:56:29 +0200 @@ -12,15 +12,14 @@ int vx_info_proc_sched(struct _vx_sched "Interval:\t%8d,%d\n" "TokensMin:\t%8d\n" "TokensMax:\t%8d\n" - "PrioBias:\t%8d\n" - ,sched->fill_rate[0] - ,sched->fill_rate[1] - ,sched->interval[0] - ,sched->interval[1] - ,sched->tokens_min - ,sched->tokens_max - ,sched->prio_bias - ); + "PrioBias:\t%8d\n", + sched->fill_rate[0], + sched->fill_rate[1], + sched->interval[0], + sched->interval[1], + sched->tokens_min, + sched->tokens_max, + sched->prio_bias); return length; } @@ -31,31 +30,27 @@ int vx_info_proc_sched_pc(struct _vx_sch int length = 0; length += sprintf(buffer + length, - "cpu %d: %lld %lld %lld %ld %ld" - ,cpu - ,(unsigned long long)sched_pc->user_ticks - ,(unsigned long long)sched_pc->sys_ticks - ,(unsigned long long)sched_pc->hold_ticks - ,sched_pc->token_time - ,sched_pc->idle_time - ); + "cpu %d: %lld %lld %lld %ld %ld", cpu, + (unsigned long long)sched_pc->user_ticks, + (unsigned long long)sched_pc->sys_ticks, + (unsigned long long)sched_pc->hold_ticks, + sched_pc->token_time, + sched_pc->idle_time); length += sprintf(buffer + length, - " %c%c %d %d %d %d/%d %d/%d" - ,(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R' - ,(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-' - ,sched_pc->tokens - ,sched_pc->tokens_min - ,sched_pc->tokens_max - ,sched_pc->fill_rate[0] - ,sched_pc->interval[0] - ,sched_pc->fill_rate[1] - ,sched_pc->interval[1] - ); + " %c%c %d %d %d %d/%d %d/%d", + (sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R', + (sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-', + sched_pc->tokens, + sched_pc->tokens_min, + sched_pc->tokens_max, + sched_pc->fill_rate[0], + sched_pc->interval[0], + sched_pc->fill_rate[1], + sched_pc->interval[1]); length += sprintf(buffer + length, - " %d %d\n" - ,sched_pc->prio_bias - ,sched_pc->vavavoom - ); + " %d %d\n", + sched_pc->prio_bias, + sched_pc->vavavoom); return length; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/signal.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/signal.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/signal.c 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/signal.c 2007-06-13 06:55:12 +0200 @@ -77,7 +77,7 @@ int vc_ctx_kill(struct vx_info *vxi, voi { struct vcmd_ctx_kill_v0 vc_data; - if (copy_from_user (&vc_data, data, sizeof(vc_data))) + if (copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; /* special check to allow guest shutdown */ @@ -127,7 +127,7 @@ int vc_wait_exit(struct vx_info *vxi, vo vc_data.reboot_cmd = vxi->reboot_cmd; vc_data.exit_code = vxi->exit_code; - if (copy_to_user (data, &vc_data, sizeof(vc_data))) + if (copy_to_user(data, &vc_data, sizeof(vc_data))) ret = -EFAULT; return ret; } diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/space.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/space.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/space.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/space.c 2007-06-13 10:00:57 +0200 @@ -105,7 +105,7 @@ out: */ static inline -struct nsproxy * __vs_merge_nsproxy(struct nsproxy *old, +struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old, struct nsproxy *proxy, unsigned long mask) { struct nsproxy null_proxy = { .mnt_ns = NULL }; @@ -126,7 +126,7 @@ struct nsproxy * __vs_merge_nsproxy(stru */ static inline -struct fs_struct * __vs_merge_fs(struct fs_struct *old, +struct fs_struct *__vs_merge_fs(struct fs_struct *old, struct fs_struct *fs, unsigned long mask) { if (!(mask & CLONE_FS)) { @@ -254,7 +254,7 @@ int vc_enter_space(struct vx_info *vxi, { struct vcmd_space_mask vc_data = { .mask = 0 }; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return vx_enter_space(vxi, vc_data.mask); @@ -264,7 +264,7 @@ int vc_set_space(struct vx_info *vxi, vo { struct vcmd_space_mask vc_data = { .mask = 0 }; - if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) return -EFAULT; return vx_set_space(vxi, vc_data.mask); diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/switch.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/switch.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/switch.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/switch.c 2007-06-13 09:33:15 +0200 @@ -62,10 +62,10 @@ int vc_get_vci(uint32_t id) #ifdef CONFIG_COMPAT #define __COMPAT(name, id, data, compat) \ - (compat) ? name ## _x32 (id, data) : name (id, data) + (compat) ? name ## _x32(id, data) : name(id, data) #else #define __COMPAT(name, id, data, compat) \ - name (id, data) + name(id, data) #endif @@ -387,7 +387,7 @@ long do_vserver(uint32_t cmd, uint32_t i #ifdef CONFIG_VSERVER_LEGACY if (!capable(CAP_CONTEXT) && /* dirty hack for capremove */ - !(cmd==VCMD_new_s_context && id==-2)) + !(cmd == VCMD_new_s_context && id == -2)) goto out; #else if (!capable(CAP_CONTEXT)) diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sysctl.c linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sysctl.c --- linux-2.6.20.14-vs2.2.0/kernel/vserver/sysctl.c 2007-04-01 16:26:13 +0200 +++ linux-2.6.20.14-vs2.2.0.0.4/kernel/vserver/sysctl.c 2007-06-13 09:54:13 +0200 @@ -135,24 +135,24 @@ done: { \ .ctl_name = ctl, \ .procname = #name, \ - .data = &vx_##name, \ + .data = &vx_ ## name, \ .maxlen = sizeof(int), \ .mode = 0644, \ .proc_handler = &proc_dodebug \ } static ctl_table debug_table[] = { - CTL_ENTRY (CTL_DEBUG_SWITCH, debug_switch), - CTL_ENTRY (CTL_DEBUG_XID, debug_xid), - CTL_ENTRY (CTL_DEBUG_NID, debug_nid), - CTL_ENTRY (CTL_DEBUG_TAG, debug_tag), - CTL_ENTRY (CTL_DEBUG_NET, debug_net), - CTL_ENTRY (CTL_DEBUG_LIMIT, debug_limit), - CTL_ENTRY (CTL_DEBUG_CRES, debug_cres), - CTL_ENTRY (CTL_DEBUG_DLIM, debug_dlim), - CTL_ENTRY (CTL_DEBUG_QUOTA, debug_quota), - CTL_ENTRY (CTL_DEBUG_CVIRT, debug_cvirt), - CTL_ENTRY (CTL_DEBUG_MISC, debug_misc), + CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch), + CTL_ENTRY(CTL_DEBUG_XID, debug_xid), + CTL_ENTRY(CTL_DEBUG_NID, debug_nid), + CTL_ENTRY(CTL_DEBUG_TAG, debug_tag), + CTL_ENTRY(CTL_DEBUG_NET, debug_net), + CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit), + CTL_ENTRY(CTL_DEBUG_CRES, debug_cres), + CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim), + CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota), + CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt), + CTL_ENTRY(CTL_DEBUG_MISC, debug_misc), { .ctl_name = 0 } }; @@ -203,7 +203,7 @@ static int __init vs_debug_setup(char *s continue; token = match_token(p, tokens, args); - value = (token>0)?simple_strtoul(args[0].from, NULL, 0):0; + value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0; switch (token) { HANDLE_CASE(SWITCH, switch, value); diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/af_inet.c linux-2.6.20.14-vs2.2.0.0.4/net/ipv4/af_inet.c --- linux-2.6.20.14-vs2.2.0/net/ipv4/af_inet.c 2007-02-06 03:05:22 +0100 +++ linux-2.6.20.14-vs2.2.0.0.4/net/ipv4/af_inet.c 2007-06-13 03:44:01 +0200 @@ -424,10 +424,10 @@ int inet_bind(struct socket *sock, struc s_addr2 = 0xffffffffl; vxdprintk(VXD_CBIT(net, 3), - "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d", + "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT, sk, sk->sk_nx_info, sk->sk_socket, (sk->sk_socket?sk->sk_socket->flags:0), - VXD_QUAD(s_addr)); + NIPQUAD(s_addr)); if (nxi) { __u32 v4_bcast = nxi->v4_bcast; __u32 ipv4root = nxi->ipv4[0]; @@ -451,8 +451,8 @@ int inet_bind(struct socket *sock, struc chk_addr_ret = inet_addr_type(s_addr); vxdprintk(VXD_CBIT(net, 3), - "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d", - sk, VXD_QUAD(s_addr), VXD_QUAD(s_addr1), VXD_QUAD(s_addr2)); + "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT ", " NIPQUAD_FMT, + sk, NIPQUAD(s_addr), NIPQUAD(s_addr1), NIPQUAD(s_addr2)); /* Not specified by any standard per-se, however it breaks too * many applications when removed. It is unfortunate since