[kernel] r12471 - dists/sid/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Tue Dec  2 07:08:06 2008
New Revision: 12471

Log:
adjust to apply on top of recent security patches

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

Modified: dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Dec  2 07:08:06 2008
@@ -8856,7 +8856,7 @@
  
  static inline void get_inotify_handle(struct inotify_handle *ih)
  {
-@@ -118,6 +106,9 @@ void put_inotify_watch(struct inotify_watch *watch)
+@@ -132,6 +120,9 @@ void put_inotify_watch(struct inotify_wa
  		struct inotify_handle *ih = watch->ih;
  
  		iput(watch->inode);
@@ -8866,7 +8866,7 @@
  		ih->in_ops->destroy_watch(watch);
  		put_inotify_handle(ih);
  	}
-@@ -476,6 +467,8 @@ void inotify_init_watch(struct inotify_watch *watch)
+@@ -497,6 +488,8 @@ void inotify_init_watch(struct inotify_w
  	INIT_LIST_HEAD(&watch->i_list);
  	atomic_set(&watch->count, 0);
  	get_inotify_watch(watch); /* initial get */
@@ -8875,7 +8875,7 @@
  }
  EXPORT_SYMBOL_GPL(inotify_init_watch);
  
-@@ -616,8 +609,8 @@ EXPORT_SYMBOL_GPL(inotify_find_update_watch);
+@@ -749,8 +742,8 @@ EXPORT_SYMBOL_GPL(inotify_find_update_wa
   * Caller must ensure it only calls inotify_add_watch() once per watch.
   * Calls inotify_handle_get_wd() so may sleep.
   */
@@ -8886,7 +8886,7 @@
  {
  	int ret = 0;
  	int newly_watched;
-@@ -645,6 +638,10 @@ s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch,
+@@ -778,6 +771,10 @@ s32 inotify_add_watch(struct inotify_han
  	 * Save a reference to the inode and bump the ref count to make it
  	 * official.  We hold a reference to nameidata, which makes this safe.
  	 */
@@ -8897,7 +8897,7 @@
  	watch->inode = igrab(inode);
  
  	/* Add the watch to the handle's and the inode's list */
-@@ -666,6 +663,18 @@ out:
+@@ -799,6 +796,18 @@ out:
  }
  EXPORT_SYMBOL_GPL(inotify_add_watch);
  
@@ -24141,7 +24141,7 @@
  	struct inode		*inode;	/* associated inode */
  	__s32			wd;	/* watch descriptor */
  	__u32			mask;	/* event mask for this watch */
-@@ -120,6 +122,8 @@ extern __s32 inotify_find_update_watch(struct inotify_handle *, struct inode *,
+@@ -120,6 +122,8 @@ extern __s32 inotify_find_update_watch(s
  				       u32);
  extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,
  			       struct inode *, __u32);
@@ -24150,9 +24150,9 @@
  extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *);
  extern void inotify_evict_watch(struct inotify_watch *);
  extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);
-@@ -129,6 +133,66 @@ extern void inotify_remove_watch_locked(struct inotify_handle *,
- extern void get_inotify_watch(struct inotify_watch *);
- extern void put_inotify_watch(struct inotify_watch *);
+@@ -131,6 +135,66 @@ extern void put_inotify_watch(struct ino
+ extern int pin_inotify_watch(struct inotify_watch *);
+ extern void unpin_inotify_watch(struct inotify_watch *);
  
 +/*
 + * struct inotify_handle - represents an inotify instance
@@ -24217,7 +24217,7 @@
  #else
  
  static inline void inotify_d_instantiate(struct dentry *dentry,
-@@ -198,6 +262,13 @@ static inline __s32 inotify_add_watch(struct inotify_handle *ih,
+@@ -200,6 +264,13 @@ static inline __s32 inotify_add_watch(st
  	return -EOPNOTSUPP;
  }
  
@@ -28638,10 +28638,10 @@
 index 2dfa96b..10183b3 100644
 --- a/include/net/af_unix.h
 +++ b/include/net/af_unix.h
-@@ -9,6 +9,7 @@
- extern void unix_inflight(struct file *fp);
+@@ -10,6 +10,7 @@ extern void unix_inflight(struct file *f
  extern void unix_notinflight(struct file *fp);
  extern void unix_gc(void);
+ extern void wait_for_unix_gc(void);
 +extern void unix_destruct_fds(struct sk_buff *skb);
  
  #define UNIX_HASH_SIZE	256
@@ -82455,10 +82455,10 @@
 index ebdff3d..1ed511f 100644
 --- a/net/unix/garbage.c
 +++ b/net/unix/garbage.c
-@@ -80,6 +80,7 @@
- #include <linux/file.h>
+@@ -81,6 +81,7 @@
  #include <linux/proc_fs.h>
  #include <linux/mutex.h>
+ #include <linux/wait.h>
 +#include <linux/module.h>
  
  #include <net/sock.h>