The patch titled inotify: fix check for one-shot watches before destroying them has been added to the -mm tree. Its filename is inotify-fix-check-for-one-shot-watches-before-destroying-them.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: inotify: fix check for one-shot watches before destroying them From: Ulisses Furquim <ulissesf@xxxxxxxxx> As the IN_ONESHOT bit is never set when an event is sent we must check it in the watch's mask and not in the event's mask. Signed-off-by: Ulisses Furquim <ulissesf@xxxxxxxxx> Reported-by: "Clem Taylor" <clem.taylor@xxxxxxxxx> Tested-by: "Clem Taylor" <clem.taylor@xxxxxxxxx> Cc: Amy Griffis <amy.griffis@xxxxxx> Cc: Robert Love <rlove@xxxxxxxxxx> Cc: John McCutchan <ttb@xxxxxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/inotify_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/inotify_user.c~inotify-fix-check-for-one-shot-watches-before-destroying-them fs/inotify_user.c --- a/fs/inotify_user.c~inotify-fix-check-for-one-shot-watches-before-destroying-them +++ a/fs/inotify_user.c @@ -283,7 +283,7 @@ static void inotify_dev_queue_event(stru /* we can safely put the watch as we don't reference it while * generating the event */ - if (mask & IN_IGNORED || mask & IN_ONESHOT) + if (mask & IN_IGNORED || w->mask & IN_ONESHOT) put_inotify_watch(w); /* final put */ /* coalescing: drop this event if it is a dupe of the previous */ _ Patches currently in -mm which might be from ulissesf@xxxxxxxxx are inotify-fix-check-for-one-shot-watches-before-destroying-them.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html