diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 23:23:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 23:23:04 +0200 |
| commit | 2069601b3f0ea38170d4b509b89f3ca0a373bdc1 (patch) | |
| tree | 647002d4c3814bd3d95d16ef7edef1757de8554f /fs/file_table.c | |
| parent | Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (diff) | |
| download | linux-2069601b3f0ea38170d4b509b89f3ca0a373bdc1.tar.xz linux-2069601b3f0ea38170d4b509b89f3ca0a373bdc1.zip | |
Revert "fsnotify: store struct file not struct path"
This reverts commit 3bcf3860a4ff9bbc522820b4b765e65e4deceb3e (and the
accompanying commit c1e5c954020e "vfs/fsnotify: fsnotify_close can delay
the final work in fput" that was a horribly ugly hack to make it work at
all).
The 'struct file' approach not only causes that disgusting hack, it
somehow breaks pulseaudio, probably due to some other subtlety with
f_count handling.
Fix up various conflicts due to later fsnotify work.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 2fc3b3c08911..edecd36fed9b 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -230,15 +230,6 @@ static void __fput(struct file *file) might_sleep(); fsnotify_close(file); - - /* - * fsnotify_create_event may have taken one or more references on this - * file. If it did so it left one reference for us to drop to make sure - * its calls to fput could not prematurely destroy the file. - */ - if (atomic_long_read(&file->f_count)) - return fput(file); - /* * The function eventpoll_release() should be the first called * in the file cleanup chain. |