[kernel] r15997 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Sun Jul 18 21:04:48 2010
New Revision: 15997

Log:
add inotify patches

seen in upstream submisson and on F-12, F-13.
fixes rh #607327

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/18

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jul 18 20:57:34 2010	(r15996)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jul 18 21:04:48 2010	(r15997)
@@ -33,6 +33,10 @@
     - Kirkwood: add support for PCIe1
     - Kirkwood: more factorization of the PCIe init code
 
+  [ maximilian attems ]
+  * inotify send IN_UNMOUNT events.
+  * inotify fix oneshot support.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 14 Jul 2010 01:52:56 +0100
 
 linux-2.6 (2.6.32-17) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch	Sun Jul 18 21:04:48 2010	(r15997)
@@ -0,0 +1,25 @@
+#607327
+
+During the large inotify rewrite to fsnotify I completely dropped support
+for IN_ONESHOT.  Reimplement that support.
+
+Signed-off-by: Eric Paris <eparis at redhat.com>
+---
+
+ fs/notify/inotify/inotify_fsnotify.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
+index daa666a..388a150 100644
+--- a/fs/notify/inotify/inotify_fsnotify.c
++++ b/fs/notify/inotify/inotify_fsnotify.c
+@@ -126,6 +126,9 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
+ 			ret = 0;
+ 	}
+ 
++	if (entry->mask & IN_ONESHOT)
++		fsnotify_destroy_mark(entry);
++
+ 	/*
+ 	 * If we hold the entry until after the event is on the queue
+ 	 * IN_IGNORED won't be able to pass this event in the queue

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch	Sun Jul 18 21:04:48 2010	(r15997)
@@ -0,0 +1,29 @@
+#607327 ?
+
+Since the .31 or so notify rewrite inotify has not sent events about
+inodes which are unmounted.  This patch restores those events.
+
+Signed-off-by: Eric Paris <eparis at redhat.com>
+---
+
+ fs/notify/inotify/inotify_user.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
+index 44aeb0f..f381daf 100644
+--- a/fs/notify/inotify/inotify_user.c
++++ b/fs/notify/inotify/inotify_user.c
+@@ -90,8 +90,11 @@ static inline __u32 inotify_arg_to_mask(u32 arg)
+ {
+ 	__u32 mask;
+ 
+-	/* everything should accept their own ignored and cares about children */
+-	mask = (FS_IN_IGNORED | FS_EVENT_ON_CHILD);
++	/*
++	 * everything should accept their own ignored, cares about children,
++	 * and should receive events when the inode is unmounted
++	 */
++	mask = (FS_IN_IGNORED | FS_EVENT_ON_CHILD | FS_UNMOUNT);
+ 
+ 	/* mask off the flags used to open the fd */
+ 	mask |= (arg & (IN_ALL_EVENTS | IN_ONESHOT));

Modified: dists/sid/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/18	Sun Jul 18 20:57:34 2010	(r15996)
+++ dists/sid/linux-2.6/debian/patches/series/18	Sun Jul 18 21:04:48 2010	(r15997)
@@ -63,3 +63,5 @@
 + features/all/rt28x0/0041-Staging-rt2860-correct-onstack-wait_queue_head-decla.patch
 + features/all/rt28x0/0042-Staging-rt2860-add-Belkin-F5D8055-Wireless-N-USB-Don.patch
 + bugfix/x86/drm-i915-add-reclaimable-to-i915-self-reclaimable-pa.patch
++ bugfix/all/inotify-fix-inotify-oneshot-support.patch
++ bugfix/all/inotify-send-IN_UNMOUNT-events.patch