[vserver] Linux VServer patch for 2.6.22.9

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