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

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 20:19:51 2012
New Revision: 19637

Log:
Complete fix-up of conflicts between epoll changes in OpenVZ and 2.6.32.60

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	Sun Dec 23 20:08:03 2012	(r19636)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sun Dec 23 20:19:51 2012	(r19637)
@@ -16680,6 +16680,15 @@
  
  /* Used to check for epoll file descriptor inclusion loops */
  static struct nested_calls poll_loop_ncalls;
+@@ -286,7 +207,7 @@
+ };
+ #endif /* CONFIG_SYSCTL */
+ 
+-static const struct file_operations eventpoll_fops;
++const struct file_operations eventpoll_fops;
+ 
+ static inline int is_file_epoll(struct file *f)
+ {
 @@ -672,10 +593,11 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
  }
  
@@ -33100,7 +33109,7 @@
  
  /* Flags for epoll_create1.  */
  #define EPOLL_CLOEXEC O_CLOEXEC
-@@ -63,6 +64,100 @@ static inline void eventpoll_init_file(struct file *file)
+@@ -63,6 +64,106 @@ static inline void eventpoll_init_file(struct file *file)
  	INIT_LIST_HEAD(&file->f_ep_links);
  }
  
@@ -33147,6 +33156,12 @@
 +
 +	/* The user that created the eventpoll descriptor */
 +	struct user_struct *user;
++
++	struct file *file;
++
++	/* used to optimize loop detection check */
++	int visited;
++	struct list_head visited_list_link;
 +};
 +
 +/*