[kernel] r16950 - dists/squeeze/linux-2.6/debian/patches/features/all/openvz

[Ben Hutchings]

Author: benh
Date: Mon Feb 28 04:19:00 2011
New Revision: 16950

Log:
Fix conflict between openvz.patch and af_unix-limit-recursion-level.patch

Modified:
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 28 04:15:11 2011	(r16949)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 28 04:19:00 2011	(r16950)
@@ -6532,6 +6532,9 @@
     Neither compiles, nor works.
     
     Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+
+[bwh: Fix conflict with bugfix/all/af_unix-limit-recursion-level.patch]
+
 diff --git a/COPYING.Parallels b/COPYING.Parallels
 new file mode 100644
 index 0000000..9856a2b
@@ -38707,9 +38710,9 @@
 --- a/include/net/af_unix.h
 +++ b/include/net/af_unix.h
 @@ -10,6 +10,7 @@ extern void unix_inflight(struct file *fp);
- extern void unix_notinflight(struct file *fp);
  extern void unix_gc(void);
  extern void wait_for_unix_gc(void);
+ extern struct sock *unix_get_socket(struct file *filp);
 +extern void unix_destruct_fds(struct sk_buff *skb);
  
  #define UNIX_HASH_SIZE	256
@@ -91706,8 +91709,8 @@
  }
 +EXPORT_SYMBOL_GPL(unix_destruct_fds);
  
- static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)
- {
+ #define MAX_RECURSION_LEVEL 4
+
 @@ -1547,6 +1558,16 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
  
  		size = len-sent;