The patch titled Subject: nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix has been added to the -mm tree. Its filename is nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix tweak the comment Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Boaz Harrosh <bharrosh@xxxxxxxxxxx> Cc: Chuck Lever <chuck.lever@xxxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Cc: Maxim Uvarov <maxim.uvarov@xxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/namei.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN fs/namei.c~nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix fs/namei.c --- a/fs/namei.c~nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix +++ a/fs/namei.c @@ -2856,10 +2856,10 @@ int vfs_unlink(struct inode *dir, struct if (!(dentry->d_flags & DCACHE_NFSFS_RENAMED)) d_delete(dentry); else { - /* We don't d_delete() NFS sillyrenamed files - they - * still exist. But from user side this file was - * deleted. So that we need to generate notify event - * about it. + /* + * We don't d_delete() NFS sillyrenamed files - they + * still exist. But from the user side this file was + * deleted, so we need to generate a notify event. */ struct inode *inode; int isdir; _ Subject: Subject: nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fs-xattrc-listxattr-fall-back-to-vmalloc-if-kmalloc-failed.patch fs-xattrc-listxattr-fall-back-to-vmalloc-if-kmalloc-failed-fix.patch fs-xattrc-setxattr-improve-handling-of-allocation-failures.patch simple_open-automatically-convert-to-simple_open-checkpatch-fixes.patch linux-next.patch linux-next-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-staging-zsmalloc-zsmalloc-mainc-unbork.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch drivers-xen-kconfig-fix-kconfig-layout.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix.patch percpu-remove-percpu_xxx-functions-fix.patch nfs-inotify-inotify-user-when-deleting-files-on-nfs-fix.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch brlocks-lglocks-cleanups.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch mm-push-lru-index-into-shrink_active_list-fix.patch security-keys-keyctlc-suppress-memory-allocation-failure-warning.patch spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix.patch vsprintf-further-optimize-decimal-conversion-checkpatch-fixes.patch leds-add-led-driver-for-lm3556-chip-fix-2.patch leds-add-led-driver-for-lm3556-chip-checkpatch-fixes.patch leds-add-led-driver-for-lm3556-chip-fix.patch kmod-avoid-deadlock-by-recursive-kmod-call.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch syscalls-x86-add-__nr_kcmp-syscall-v8-fix.patch syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2.patch c-r-prctl-add-ability-to-get-clear_tid_address-fix.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.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