kernel-vserver-fixes.patch

   1 Missing header for routes patch, caused vs2.3 route.h mixing
   2 --- a/net/ipv4/netfilter/nf_nat_core.c~ 2008-01-24 23:58:37.000000000 +0100
   3 +++ a/net/ipv4/netfilter/nf_nat_core.c  2008-03-30 21:00:19.349593833 +0200
   4 @@ -15,6 +15,7 @@
   5  #include <net/checksum.h>
   6  #include <net/icmp.h>
   7  #include <net/ip.h>
   8 +#include <net/route.h>
   9  #include <net/tcp.h>  /* For tcp_prot in getorigdst */
  10  #include <linux/icmp.h>
  11  #include <linux/udp.h>
  12 --- linux-2.6.33/arch/x86/kernel/process.c~     2010-02-24 19:52:17.000000000 +0100
  13 +++ linux-2.6.33/arch/x86/kernel/process.c      2010-02-25 23:44:56.487156216 +0100
  14 @@ -110,8 +110,8 @@
  15         board = dmi_get_system_info(DMI_BOARD_NAME);
  16
  17         printk(KERN_CONT "\n");
  18 -       printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
  19 -               current->pid, current->comm, print_tainted(),
  20 +       printk(KERN_DEFAULT "Pid: %d, xid: #%u, comm: %.20s %s %s %.*s",
  21 +               current->pid, current->xid, current->comm, print_tainted(),
  22                 init_utsname()->release,
  23                 (int)strcspn(init_utsname()->version, " "),
  24                 init_utsname()->version);
  25 --- linux-2.6.31/arch/x86/kernel/dumpstack.c~   2009-09-16 08:32:02.000000000 +0200
  26 +++ linux-2.6.31/arch/x86/kernel/dumpstack.c    2009-09-17 21:58:13.778791960 +0200
  27 @@ -180,8 +180,8 @@
  28         unsigned long stack;
  29
  30         bp = stack_frame(current, NULL);
  31 -       printk("Pid: %d, comm: %.20s %s %s %.*s\n",
  32 -               current->pid, current->comm, print_tainted(),
  33 +       printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
  34 +               current->pid, current->comm, current->xid, print_tainted(),
  35                 init_utsname()->release,
  36                 (int)strcspn(init_utsname()->version, " "),
  37                 init_utsname()->version);
  38
  39 --- linux-3.2/fs/xfs/xfs_vnodeops.c~    2012-03-12 17:22:36.000000000 +0100
  40 +++ linux-3.2/fs/xfs/xfs_vnodeops.c     2012-03-12 18:57:38.818045193 +0100
  41 @@ -152,7 +152,7 @@
  42                 goto error_out;
  43
  44         xfs_ilock(ip, XFS_ILOCK_EXCL);
  45 -       xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
  46 +       xfs_trans_ijoin(tp, ip, 0);
  47
  48         inode->i_flags = flags;
  49         inode->i_vflags = vflags;