rpms/kernel/F-12 inotify-fix-inotify-oneshot-support.patch, NONE, 1.1 inotify-send-IN_UNMOUNT-events.patch, NONE, 1.1 kernel.spec, 1.2104, 1.2105

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32137

Modified Files:
	kernel.spec 
Added Files:
	inotify-fix-inotify-oneshot-support.patch 
	inotify-send-IN_UNMOUNT-events.patch 
Log Message:
inotify-fix-inotify-oneshot-support.patch,
  inotify-send-IN_UNMOUNT-events.patch:
  Fix broken oneshot support and missing umount events. (F13#607327)

inotify-fix-inotify-oneshot-support.patch:
 inotify_fsnotify.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE inotify-fix-inotify-oneshot-support.patch ---
#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

inotify-send-IN_UNMOUNT-events.patch:
 inotify_user.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE inotify-send-IN_UNMOUNT-events.patch ---
#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));


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2104
retrieving revision 1.2105
diff -u -p -r1.2104 -r1.2105
--- kernel.spec	14 Jul 2010 16:36:41 -0000	1.2104
+++ kernel.spec	16 Jul 2010 14:38:15 -0000	1.2105
@@ -838,6 +838,9 @@ Patch13030: l2tp-fix-oops-in-pppol2tp_xm
 Patch14000: sched-fix-over-scheduling-bug.patch
 Patch14010: ethtool-fix-buffer-overflow.patch
 
+Patch14020: inotify-fix-inotify-oneshot-support.patch
+Patch14030: inotify-send-IN_UNMOUNT-events.patch
+
 # ==============================================================================
 %endif
 
@@ -1530,6 +1533,10 @@ ApplyPatch sched-fix-over-scheduling-bug
 # CVE-2010-2478
 ApplyPatch ethtool-fix-buffer-overflow.patch
 
+# fix broken oneshot support and missing umount events (F13#607327)
+ApplyPatch inotify-fix-inotify-oneshot-support.patch
+ApplyPatch inotify-send-IN_UNMOUNT-events.patch
+
 # END OF PATCH APPLICATIONS ====================================================
 %endif
 
@@ -2179,6 +2186,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jul 16 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.16-143
+- inotify-fix-inotify-oneshot-support.patch,
+  inotify-send-IN_UNMOUNT-events.patch:
+  Fix broken oneshot support and missing umount events. (F13#607327)
+
 * Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.16-142
 - Drop Intel Moorestown support.