rpms/kernel/F-13 inotify-fix-inotify-oneshot-support.patch, NONE, 1.2.2.2 inotify-send-IN_UNMOUNT-events.patch, NONE, 1.1.2.2 kernel.spec, 1.2084.2.3, 1.2084.2.4

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
      Tag: private-f13-2_6_33
	kernel.spec 
Added Files:
      Tag: private-f13-2_6_33
	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. (#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_by_entry(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-13/kernel.spec,v
retrieving revision 1.2084.2.3
retrieving revision 1.2084.2.4
diff -u -p -r1.2084.2.3 -r1.2084.2.4
--- kernel.spec	23 Jul 2010 16:44:55 -0000	1.2084.2.3
+++ kernel.spec	23 Jul 2010 16:59:44 -0000	1.2084.2.4
@@ -868,6 +868,9 @@ Patch13060: x86-debug-send-sigtrap-for-u
 
 Patch13070: cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
 
+Patch13074: inotify-fix-inotify-oneshot-support.patch
+Patch13076: inotify-send-IN_UNMOUNT-events.patch
+
 Patch13080: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 
 %endif
@@ -1596,7 +1599,11 @@ ApplyPatch x86-debug-send-sigtrap-for-us
 # CVE-2010-2524
 ApplyPatch cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
 
-# 610911
+# fix broken oneshot support and missing umount events (#607327)
+ApplyPatch inotify-fix-inotify-oneshot-support.patch
+ApplyPatch inotify-send-IN_UNMOUNT-events.patch
+
+# RHBZ#610911
 ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 
 # END OF PATCH APPLICATIONS
@@ -2247,6 +2254,11 @@ fi
 
 
 %changelog
+* Fri Jul 23 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.33.6-147.2.4
+- inotify-fix-inotify-oneshot-support.patch,
+  inotify-send-IN_UNMOUNT-events.patch:
+  Fix broken oneshot support and missing umount events. (#607327)
+
 * Fri Jul 23 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.33.6-147.2.3
 - drm-i915-add-reclaimable-to-page-allocations.patch:
   Additional fix for hibernation memory corruption bugs.