diff options
| author | Linus Torvalds | 2019-07-10 20:09:17 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-10 20:09:17 -0700 |
| commit | e6983afd9254c559acf67dd5f62df824d19851eb (patch) | |
| tree | 06ab8b4457f90b5776b4d7cd7b340bd81b907eb0 /fs/nfs | |
| parent | 988052f47adc5c3b0b004180b59bb3761d91b752 (diff) | |
| parent | 7377f5bec13332bc470856f337935be6cabbcf24 (diff) | |
Merge tag 'fsnotify_for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"This contains cleanups of the fsnotify name removal hook and also a
patch to disable fanotify permission events for 'proc' filesystem"
* tag 'fsnotify_for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fsnotify: get rid of fsnotify_nameremove()
fsnotify: move fsnotify_nameremove() hook out of d_delete()
configfs: call fsnotify_rmdir() hook
debugfs: call fsnotify_{unlink,rmdir}() hooks
debugfs: simplify __debugfs_remove_file()
devpts: call fsnotify_unlink() hook
tracefs: call fsnotify_{unlink,rmdir}() hooks
rpc_pipefs: call fsnotify_{unlink,rmdir}() hooks
btrfs: call fsnotify_rmdir() hook
fsnotify: add empty fsnotify_{unlink,rmdir}() hooks
fanotify: Disallow permission events for proc filesystem
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/unlink.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 52d533967485..0effeee28352 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -396,12 +396,6 @@ nfs_complete_sillyrename(struct rpc_task *task, struct nfs_renamedata *data) nfs_cancel_async_unlink(dentry); return; } - - /* - * vfs_unlink and the like do not issue this when a file is - * sillyrenamed, so do it here. - */ - fsnotify_nameremove(dentry, 0); } #define SILLYNAME_PREFIX ".nfs" |