[packages/kernel] - final vserver fixes

[baggins]

commit eafa5b1dec0f73658835626d112bceaf8784380f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jun 25 01:40:01 2014 +0200

    - final vserver fixes

 kernel-vserver-2.3.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index a4e5c8a..af63e17 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -4179,8 +4179,8 @@ diff -NurpP --minimal linux-3.13.10/fs/locks.c linux-3.13.10-vs2.3.6.11/fs/locks
  	fl.fl_type = (read_write == FLOCK_VERIFY_WRITE) ? F_WRLCK : F_RDLCK;
  	fl.fl_start = offset;
  	fl.fl_end = offset + count - 1;
-+	if (flip)
-+		xid = flip->f_xid;
++	if (filp)
++		xid = filp->f_xid;
 +	else
 +		xid = vx_current_xid();
  
@@ -4720,7 +4720,7 @@ diff -NurpP --minimal linux-3.13.10/fs/namei.c linux-3.13.10-vs2.3.6.11/fs/namei
 +		old_dentry->d_name.len, old_dentry->d_name.name,
 +		old_dentry->d_name.len);
 +	ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry,
-+		old_dentry->d_parent->d_inode, old_dentry, NULL);
++		old_dentry->d_parent->d_inode, old_dentry, NULL, 0);
 +	vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
 +
 +out_unlock:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eafa5b1dec0f73658835626d112bceaf8784380f