[kernel] r6277 - in dists/sid/linux-2.6/debian: . patches patches/series

[Bastian Blank]

Author: waldi
Date: Fri Mar 24 11:54:49 2006
New Revision: 6277

Added:
   dists/sid/linux-2.6/debian/patches/series/3-extra
   dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
Log:
Update vserver patch to 2.0.2-rc14.

* debian/changelog: Update.
* debian/patches/series/3-extra: Add vserver-vs2.0.2-rc14-update.patch.
* debian/patches/vserver-vs2.0.2-rc14-update.patch: Add.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Mar 24 11:54:49 2006
@@ -11,7 +11,11 @@
   [ Martin Michlmayr ]
   * [arm/armeb] Enable CONFIG_NFSD on NSLU2 again.  Closes: #358709.
 
- -- Frederik Schüler <fs at debian.org>  Thu, 23 Mar 2006 18:47:46 +0100
+  [ Bastian Blank ]
+  * Update vserver patch to 2.0.2-rc14.
+    - Fix sendfile. (closes: #358391, #358752)
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 24 Mar 2006 12:49:46 +0100
 
 linux-2.6 (2.6.16-2) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/series/3-extra
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/3-extra	Fri Mar 24 11:54:49 2006
@@ -0,0 +1 @@
++ vserver-vs2.0.2-rc14-update.patch *_vserver

Added: dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch	Fri Mar 24 11:54:49 2006
@@ -0,0 +1,44 @@
+--- linux-2.6.16-vs2.0.2-rc13/fs/ioprio.c	2006-03-20 17:34:49 +0100
++++ linux-2.6.16-vs2.0.2-rc14/fs/ioprio.c	2006-03-23 19:35:17 +0100
+@@ -96,7 +96,7 @@
+ 			if (!who)
+ 				user = current->user;
+ 			else
+-				user = find_user(who, vx_current_xid());
++				user = find_user(vx_current_xid(), who);
+ 
+ 			if (!user)
+ 				break;
+@@ -150,7 +150,7 @@
+ 			if (!who)
+ 				user = current->user;
+ 			else
+-				user = find_user(who, vx_current_xid());
++				user = find_user(vx_current_xid(), who);
+ 
+ 			if (!user)
+ 				break;
+--- linux-2.6.16-vs2.0.2-rc13/fs/read_write.c	2006-03-20 17:34:49 +0100
++++ linux-2.6.16/fs/read_write.c	2006-03-20 17:33:14 +0100
+@@ -667,8 +667,9 @@
+ 		if (!(in_file->f_mode & FMODE_PREAD))
+ 			goto fput_in;
+ 	retval = rw_verify_area(READ, in_file, ppos, count);
++	if (retval < 0)
+-	if (retval)
+ 		goto fput_in;
++	count = retval;
+ 
+ 	retval = security_file_permission (in_file, MAY_READ);
+ 	if (retval)
+@@ -688,8 +689,9 @@
+ 		goto fput_out;
+ 	out_inode = out_file->f_dentry->d_inode;
+ 	retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
++	if (retval < 0)
+-	if (retval)
+ 		goto fput_out;
++	count = retval;
+ 
+ 	retval = security_file_permission (out_file, MAY_WRITE);
+ 	if (retval)