Subject: Linux VServer patch for 2.6.22.9
From: Oliver Paulus <oliver@code-project.org>
Date: Fri, 28 Sep 2007 11:27:09 +0200
Fri, 28 Sep 2007 11:27:09 +0200
Hello,

I have tried to apply the patch 2.6.22.6-vs2.2.0.3.diff to kernel 2.6.22.9. I
have got 2 rejects. First reject was in the makefile because of the version
number.  The second reject was in the file "fs/locks.c". This is the reject
info for fs/locks.c:
*************** find_conflict:
*** 787,792 ****
                goto out;
        locks_copy_lock(new_fl, request);
        locks_insert_lock(&inode->i_flock, new_fl);
        new_fl = NULL;
        error = 0;

--- 806,812 ----
                goto out;
        locks_copy_lock(new_fl, request);
        locks_insert_lock(&inode->i_flock, new_fl);
+       vx_locks_inc(new_fl);
        new_fl = NULL;
        error = 0;
This is the part from the vserver patch:
@@ -787,6 +806,7 @@ find_conflict:
                goto out;
        locks_copy_lock(new_fl, request);
        locks_insert_lock(&inode->i_flock, new_fl);
+       vx_locks_inc(new_fl);
        new_fl = NULL;
        error = 0;

@@ -797,7 +817,8 @@ out:
        return error;
 }
And this is the code part in the 2.6.22.9 "fs/locks.c" source:
                goto out;
        locks_copy_lock(new_fl, request);
        locks_insert_lock(before, new_fl);
        vx_locks_inc(new_fl);
        new_fl = NULL;
        error = 0;

out:
        unlock_kernel();
        if (new_fl)
                locks_free_lock(new_fl);
        return error;
}
The problem seems that the "out" label code has some major changes.

Is it possible that you can provide a patch for 2.6.22.9? I do not have any
kernel programming skills :(

I have attached the complete patch result output.

Regards
--
Oliver Paulus

OpenPGP
Key id: 28D9C44F
Fingerprint: EADA 62FC 07DC 3361 A3D6  4174 2DE3 C027 28D9 C44F
Public Key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x28D9C44F

patching file Documentation/vserver/debug.txt
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file arch/alpha/Kconfig
patching file arch/alpha/kernel/asm-offsets.c
patching file arch/alpha/kernel/entry.S
patching file arch/alpha/kernel/osf_sys.c
patching file arch/alpha/kernel/ptrace.c
patching file arch/alpha/kernel/semaphore.c
patching file arch/alpha/kernel/systbls.S
patching file arch/alpha/kernel/traps.c
patching file arch/alpha/mm/fault.c
patching file arch/arm/Kconfig
patching file arch/arm/kernel/calls.S
patching file arch/arm/kernel/process.c
patching file arch/arm/kernel/traps.c
patching file arch/arm/mm/fault.c
patching file arch/arm26/Kconfig
patching file arch/arm26/kernel/calls.S
patching file arch/arm26/kernel/process.c
patching file arch/arm26/kernel/traps.c
patching file arch/cris/Kconfig
patching file arch/cris/arch-v10/kernel/process.c
patching file arch/cris/arch-v32/kernel/process.c
patching file arch/frv/kernel/kernel_thread.S
patching file arch/h8300/Kconfig
patching file arch/h8300/kernel/process.c
patching file arch/i386/Kconfig
patching file arch/i386/kernel/process.c
patching file arch/i386/kernel/syscall_table.S
patching file arch/i386/kernel/sysenter.c
patching file arch/i386/kernel/traps.c
patching file arch/i386/mm/fault.c
patching file arch/ia64/Kconfig
patching file arch/ia64/ia32/binfmt_elf32.c
patching file arch/ia64/ia32/ia32_entry.S
patching file arch/ia64/ia32/sys_ia32.c
patching file arch/ia64/kernel/asm-offsets.c
patching file arch/ia64/kernel/entry.S
patching file arch/ia64/kernel/perfmon.c
patching file arch/ia64/kernel/process.c
patching file arch/ia64/kernel/ptrace.c
patching file arch/ia64/kernel/traps.c
patching file arch/ia64/mm/fault.c
patching file arch/m32r/kernel/process.c
patching file arch/m32r/kernel/traps.c
patching file arch/m68k/Kconfig
patching file arch/m68k/kernel/process.c
patching file arch/m68k/kernel/ptrace.c
patching file arch/m68k/kernel/traps.c
patching file arch/m68knommu/Kconfig
patching file arch/m68knommu/kernel/process.c
patching file arch/m68knommu/kernel/traps.c
patching file arch/mips/Kconfig
patching file arch/mips/kernel/linux32.c
patching file arch/mips/kernel/process.c
patching file arch/mips/kernel/ptrace.c
patching file arch/mips/kernel/scall32-o32.S
patching file arch/mips/kernel/scall64-64.S
patching file arch/mips/kernel/scall64-n32.S
patching file arch/mips/kernel/scall64-o32.S
patching file arch/mips/kernel/traps.c
patching file arch/mips/mm/fault.c
patching file arch/parisc/Kconfig
patching file arch/parisc/kernel/entry.S
patching file arch/parisc/kernel/process.c
patching file arch/parisc/kernel/sys_parisc32.c
patching file arch/parisc/kernel/syscall_table.S
patching file arch/parisc/kernel/traps.c
patching file arch/parisc/mm/fault.c
patching file arch/powerpc/Kconfig
patching file arch/powerpc/kernel/asm-offsets.c
patching file arch/powerpc/kernel/irq.c
patching file arch/powerpc/kernel/misc_32.S
patching file arch/powerpc/kernel/misc_64.S
patching file arch/powerpc/kernel/process.c
patching file arch/powerpc/kernel/sys_ppc32.c
patching file arch/powerpc/kernel/traps.c
patching file arch/powerpc/kernel/vdso.c
patching file arch/powerpc/mm/fault.c
patching file arch/ppc/Kconfig
patching file arch/ppc/kernel/asm-offsets.c
patching file arch/ppc/kernel/misc.S
patching file arch/ppc/kernel/traps.c
patching file arch/ppc/mm/fault.c
patching file arch/s390/Kconfig
patching file arch/s390/kernel/compat_linux.c
patching file arch/s390/kernel/process.c
patching file arch/s390/kernel/ptrace.c
patching file arch/s390/kernel/syscalls.S
patching file arch/s390/mm/fault.c
patching file arch/sh/Kconfig
patching file arch/sh/kernel/irq.c
patching file arch/sh/kernel/process.c
patching file arch/sh/kernel/vsyscall/vsyscall.c
patching file arch/sh/mm/fault.c
patching file arch/sh64/kernel/process.c
patching file arch/sh64/mm/fault.c
patching file arch/sparc/Kconfig
patching file arch/sparc/kernel/process.c
patching file arch/sparc/kernel/ptrace.c
patching file arch/sparc/kernel/systbls.S
patching file arch/sparc/kernel/traps.c
patching file arch/sparc/mm/fault.c
patching file arch/sparc64/Kconfig
patching file arch/sparc64/kernel/binfmt_aout32.c
patching file arch/sparc64/kernel/process.c
patching file arch/sparc64/kernel/ptrace.c
patching file arch/sparc64/kernel/sys_sparc32.c
patching file arch/sparc64/kernel/systbls.S
patching file arch/sparc64/kernel/traps.c
patching file arch/sparc64/mm/fault.c
patching file arch/sparc64/solaris/fs.c
patching file arch/um/Kconfig
patching file arch/um/kernel/trap.c
patching file arch/v850/Kconfig
patching file arch/v850/kernel/process.c
patching file arch/v850/kernel/ptrace.c
patching file arch/x86_64/Kconfig
patching file arch/x86_64/ia32/ia32_aout.c
patching file arch/x86_64/ia32/ia32_binfmt.c
patching file arch/x86_64/ia32/ia32entry.S
Hunk #1 succeeded at 680 (offset 12 lines).
patching file arch/x86_64/ia32/sys_ia32.c
patching file arch/x86_64/ia32/syscall32.c
patching file arch/x86_64/kernel/process.c
patching file arch/x86_64/kernel/traps.c
patching file arch/x86_64/mm/fault.c
patching file drivers/block/Kconfig
patching file drivers/block/Makefile
patching file drivers/block/loop.c
patching file drivers/block/vroot.c
patching file drivers/char/sysrq.c
patching file drivers/char/tty_io.c
patching file drivers/infiniband/hw/ipath/ipath_user_pages.c
patching file drivers/md/dm-ioctl.c
patching file drivers/md/dm.c
patching file drivers/md/dm.h
patching file fs/attr.c
patching file fs/binfmt_aout.c
patching file fs/binfmt_elf.c
patching file fs/binfmt_flat.c
patching file fs/binfmt_som.c
patching file fs/dcache.c
patching file fs/devpts/inode.c
patching file fs/ecryptfs/inode.c
patching file fs/exec.c
patching file fs/ext2/balloc.c
patching file fs/ext2/ext2.h
patching file fs/ext2/file.c
patching file fs/ext2/ialloc.c
patching file fs/ext2/inode.c
patching file fs/ext2/ioctl.c
patching file fs/ext2/namei.c
patching file fs/ext2/super.c
patching file fs/ext2/symlink.c
patching file fs/ext2/xattr.c
patching file fs/ext3/balloc.c
patching file fs/ext3/file.c
patching file fs/ext3/ialloc.c
patching file fs/ext3/inode.c
patching file fs/ext3/ioctl.c
patching file fs/ext3/namei.c
Hunk #2 succeeded at 1053 (offset 33 lines).
Hunk #3 succeeded at 2445 (offset 57 lines).
Hunk #4 succeeded at 2457 (offset 57 lines).
patching file fs/ext3/super.c
patching file fs/ext3/symlink.c
patching file fs/ext3/xattr.c
patching file fs/ext4/balloc.c
patching file fs/ext4/file.c
patching file fs/ext4/ialloc.c
patching file fs/ext4/inode.c
patching file fs/ext4/ioctl.c
patching file fs/ext4/namei.c
Hunk #2 succeeded at 1051 (offset 33 lines).
Hunk #3 succeeded at 2443 (offset 57 lines).
Hunk #4 succeeded at 2455 (offset 57 lines).
patching file fs/ext4/super.c
patching file fs/ext4/symlink.c
patching file fs/ext4/xattr.c
patching file fs/fcntl.c
patching file fs/file_table.c
patching file fs/hfsplus/ioctl.c
patching file fs/inode.c
patching file fs/ioctl.c
patching file fs/ioprio.c
patching file fs/jfs/acl.c
patching file fs/jfs/file.c
patching file fs/jfs/inode.c
patching file fs/jfs/ioctl.c
patching file fs/jfs/jfs_dinode.h
patching file fs/jfs/jfs_dtree.c
patching file fs/jfs/jfs_extent.c
patching file fs/jfs/jfs_filsys.h
patching file fs/jfs/jfs_imap.c
patching file fs/jfs/jfs_inode.c
patching file fs/jfs/jfs_inode.h
patching file fs/jfs/jfs_xtree.c
patching file fs/jfs/namei.c
patching file fs/jfs/super.c
patching file fs/jfs/xattr.c
patching file fs/libfs.c
patching file fs/locks.c
Hunk #10 FAILED at 806.
1 out of 19 hunks FAILED -- saving rejects to file fs/locks.c.rej
patching file fs/namei.c
patching file fs/namespace.c
patching file fs/nfs/client.c
patching file fs/nfs/dir.c
patching file fs/nfs/inode.c
patching file fs/nfs/nfs3xdr.c
patching file fs/nfs/nfsroot.c
patching file fs/nfs/super.c
patching file fs/nfsd/auth.c
patching file fs/nfsd/nfs3xdr.c
patching file fs/nfsd/nfs4recover.c
patching file fs/nfsd/nfs4xdr.c
patching file fs/nfsd/nfsxdr.c
patching file fs/nfsd/vfs.c
patching file fs/ocfs2/dlm/dlmfs.c
patching file fs/ocfs2/dlmglue.c
patching file fs/ocfs2/dlmglue.h
patching file fs/ocfs2/file.c
patching file fs/ocfs2/inode.c
patching file fs/ocfs2/inode.h
patching file fs/ocfs2/ioctl.c
patching file fs/ocfs2/ioctl.h
patching file fs/ocfs2/namei.c
patching file fs/ocfs2/ocfs2.h
patching file fs/ocfs2/ocfs2_fs.h
patching file fs/ocfs2/super.c
patching file fs/open.c
patching file fs/proc/array.c
patching file fs/proc/base.c
patching file fs/proc/generic.c
patching file fs/proc/inode.c
patching file fs/proc/internal.h
patching file fs/proc/proc_misc.c
patching file fs/proc/root.c
patching file fs/quota.c
patching file fs/read_write.c
patching file fs/reiserfs/bitmap.c
patching file fs/reiserfs/file.c
patching file fs/reiserfs/inode.c
patching file fs/reiserfs/ioctl.c
patching file fs/reiserfs/namei.c
patching file fs/reiserfs/stree.c
patching file fs/reiserfs/super.c
patching file fs/reiserfs/xattr.c
patching file fs/stat.c
patching file fs/super.c
patching file fs/sysfs/mount.c
patching file fs/utimes.c
patching file fs/xattr.c
patching file fs/xfs/linux-2.6/xfs_file.c
patching file fs/xfs/linux-2.6/xfs_ioctl.c
patching file fs/xfs/linux-2.6/xfs_iops.c
patching file fs/xfs/linux-2.6/xfs_linux.h
patching file fs/xfs/linux-2.6/xfs_super.c
patching file fs/xfs/linux-2.6/xfs_vnode.c
patching file fs/xfs/linux-2.6/xfs_vnode.h
patching file fs/xfs/quota/xfs_qm_syscalls.c
patching file fs/xfs/xfs_clnt.h
patching file fs/xfs/xfs_dinode.h
patching file fs/xfs/xfs_fs.h
patching file fs/xfs/xfs_inode.c
patching file fs/xfs/xfs_itable.c
patching file fs/xfs/xfs_mount.h
patching file fs/xfs/xfs_vfsops.c
patching file fs/xfs/xfs_vnodeops.c
patching file include/asm-arm/tlb.h
patching file include/asm-arm26/tlb.h
patching file include/asm-arm26/unistd.h
patching file include/asm-generic/tlb.h
patching file include/asm-ia64/tlb.h
patching file include/asm-powerpc/systbl.h
patching file include/asm-powerpc/unistd.h
patching file include/asm-s390/unistd.h
patching file include/asm-sparc/unistd.h
patching file include/asm-sparc64/tlb.h
patching file include/asm-sparc64/unistd.h
patching file include/asm-x86_64/unistd.h
patching file include/linux/Kbuild
Hunk #1 succeeded at 351 (offset 1 line).
patching file include/linux/capability.h
patching file include/linux/devpts_fs.h
patching file include/linux/ext2_fs.h
patching file include/linux/ext3_fs.h
patching file include/linux/ext4_fs.h
patching file include/linux/fs.h
patching file include/linux/init_task.h
patching file include/linux/ipc.h
patching file include/linux/loop.h
patching file include/linux/major.h
patching file include/linux/mount.h
patching file include/linux/net.h
patching file include/linux/nfs_mount.h
patching file include/linux/nsproxy.h
patching file include/linux/pid.h
patching file include/linux/proc_fs.h
patching file include/linux/reiserfs_fs.h
patching file include/linux/reiserfs_fs_sb.h
patching file include/linux/sched.h
patching file include/linux/shmem_fs.h
patching file include/linux/stat.h
patching file include/linux/sunrpc/auth.h
patching file include/linux/sunrpc/clnt.h
patching file include/linux/syscalls.h
patching file include/linux/sysctl.h
patching file include/linux/sysfs.h
patching file include/linux/time.h
patching file include/linux/types.h
patching file include/linux/vroot.h
patching file include/linux/vs_base.h
patching file include/linux/vs_context.h
patching file include/linux/vs_cowbl.h
patching file include/linux/vs_cvirt.h
patching file include/linux/vs_dlimit.h
patching file include/linux/vs_limit.h
patching file include/linux/vs_memory.h
patching file include/linux/vs_network.h
patching file include/linux/vs_pid.h
patching file include/linux/vs_sched.h
patching file include/linux/vs_socket.h
patching file include/linux/vs_tag.h
patching file include/linux/vs_time.h
patching file include/linux/vserver/Kbuild
patching file include/linux/vserver/base.h
patching file include/linux/vserver/cacct.h
patching file include/linux/vserver/cacct_cmd.h
patching file include/linux/vserver/cacct_def.h
patching file include/linux/vserver/cacct_int.h
patching file include/linux/vserver/context.h
patching file include/linux/vserver/context_cmd.h
patching file include/linux/vserver/cvirt.h
patching file include/linux/vserver/cvirt_cmd.h
patching file include/linux/vserver/cvirt_def.h
patching file include/linux/vserver/debug.h
patching file include/linux/vserver/debug_cmd.h
patching file include/linux/vserver/dlimit.h
patching file include/linux/vserver/dlimit_cmd.h
patching file include/linux/vserver/global.h
patching file include/linux/vserver/history.h
patching file include/linux/vserver/inode.h
patching file include/linux/vserver/inode_cmd.h
patching file include/linux/vserver/legacy.h
patching file include/linux/vserver/limit.h
patching file include/linux/vserver/limit_cmd.h
patching file include/linux/vserver/limit_def.h
patching file include/linux/vserver/limit_int.h
patching file include/linux/vserver/monitor.h
patching file include/linux/vserver/network.h
patching file include/linux/vserver/network_cmd.h
patching file include/linux/vserver/percpu.h
patching file include/linux/vserver/sched.h
patching file include/linux/vserver/sched_cmd.h
patching file include/linux/vserver/sched_def.h
patching file include/linux/vserver/signal.h
patching file include/linux/vserver/signal_cmd.h
patching file include/linux/vserver/space.h
patching file include/linux/vserver/space_cmd.h
patching file include/linux/vserver/switch.h
patching file include/linux/vserver/tag.h
patching file include/net/af_unix.h
patching file include/net/inet_hashtables.h
patching file include/net/inet_sock.h
patching file include/net/inet_timewait_sock.h
patching file include/net/route.h
patching file include/net/sock.h
patching file init/main.c
patching file ipc/mqueue.c
patching file ipc/msg.c
patching file ipc/sem.c
patching file ipc/shm.c
patching file ipc/util.c
patching file kernel/Makefile
patching file kernel/capability.c
patching file kernel/compat.c
patching file kernel/exit.c
patching file kernel/fork.c
patching file kernel/kthread.c
patching file kernel/nsproxy.c
patching file kernel/pid.c
patching file kernel/posix-timers.c
patching file kernel/printk.c
patching file kernel/ptrace.c
patching file kernel/sched.c
patching file kernel/sched_hard.h
patching file kernel/sched_mon.h
patching file kernel/signal.c
Hunk #6 succeeded at 1832 (offset -1 lines).
patching file kernel/softirq.c
patching file kernel/sys.c
Hunk #10 succeeded at 1448 (offset -1 lines).
Hunk #11 succeeded at 1493 (offset -1 lines).
Hunk #12 succeeded at 1519 (offset -1 lines).
Hunk #13 succeeded at 1531 (offset -1 lines).
Hunk #14 succeeded at 1882 (offset -1 lines).
Hunk #15 succeeded at 1927 (offset -1 lines).
Hunk #16 succeeded at 1994 (offset -1 lines).
patching file kernel/sysctl.c
patching file kernel/time.c
patching file kernel/timer.c
patching file kernel/user.c
patching file kernel/utsname.c
patching file kernel/vserver/Kconfig
patching file kernel/vserver/Makefile
patching file kernel/vserver/cacct.c
patching file kernel/vserver/cacct_init.h
patching file kernel/vserver/cacct_proc.h
patching file kernel/vserver/context.c
patching file kernel/vserver/cvirt.c
patching file kernel/vserver/cvirt_init.h
patching file kernel/vserver/cvirt_proc.h
patching file kernel/vserver/debug.c
patching file kernel/vserver/dlimit.c
patching file kernel/vserver/helper.c
patching file kernel/vserver/history.c
patching file kernel/vserver/init.c
patching file kernel/vserver/inode.c
patching file kernel/vserver/legacy.c
patching file kernel/vserver/legacynet.c
patching file kernel/vserver/limit.c
patching file kernel/vserver/limit_init.h
patching file kernel/vserver/limit_proc.h
patching file kernel/vserver/monitor.c
patching file kernel/vserver/network.c
patching file kernel/vserver/proc.c
patching file kernel/vserver/sched.c
patching file kernel/vserver/sched_init.h
patching file kernel/vserver/sched_proc.h
patching file kernel/vserver/signal.c
patching file kernel/vserver/space.c
patching file kernel/vserver/switch.c
patching file kernel/vserver/sysctl.c
patching file kernel/vserver/vci_config.h
patching file mm/filemap.c
patching file mm/filemap_xip.c
patching file mm/fremap.c
patching file mm/hugetlb.c
patching file mm/memory.c
patching file mm/mlock.c
patching file mm/mmap.c
patching file mm/mremap.c
patching file mm/nommu.c
patching file mm/oom_kill.c
patching file mm/page_alloc.c
patching file mm/rmap.c
patching file mm/shmem.c
patching file mm/slab.c
patching file mm/slab_vs.h
patching file mm/swapfile.c
patching file net/core/dev.c
patching file net/core/rtnetlink.c
patching file net/core/sock.c
patching file net/ipv4/af_inet.c
patching file net/ipv4/devinet.c
Hunk #7 succeeded at 1206 with fuzz 2.
patching file net/ipv4/fib_hash.c
patching file net/ipv4/inet_connection_sock.c
patching file net/ipv4/inet_diag.c
patching file net/ipv4/inet_hashtables.c
patching file net/ipv4/raw.c
patching file net/ipv4/tcp.c
patching file net/ipv4/tcp_ipv4.c
patching file net/ipv4/tcp_minisocks.c
patching file net/ipv4/udp.c
patching file net/ipv6/addrconf.c
patching file net/netlink/af_netlink.c
patching file net/socket.c
patching file net/sunrpc/auth.c
patching file net/sunrpc/auth_unix.c
patching file net/sunrpc/clnt.c
patching file net/unix/af_unix.c
patching file net/x25/af_x25.c
patching file security/Kconfig
patching file security/commoncap.c
patching file security/dummy.c


["application/pgp-signature" not shown]