diff options
author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /fs/file_table.c | |
parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/file_table.c')
-rw-r--r-- | fs/file_table.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index efc06faede6c..5ad0eca6eea2 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
@@ -269,6 +269,10 @@ void __fput(struct file *file) | |||
269 | eventpoll_release(file); | 269 | eventpoll_release(file); |
270 | locks_remove_flock(file); | 270 | locks_remove_flock(file); |
271 | 271 | ||
272 | if (unlikely(file->f_flags & FASYNC)) { | ||
273 | if (file->f_op && file->f_op->fasync) | ||
274 | file->f_op->fasync(-1, file, 0); | ||
275 | } | ||
272 | if (file->f_op && file->f_op->release) | 276 | if (file->f_op && file->f_op->release) |
273 | file->f_op->release(inode, file); | 277 | file->f_op->release(inode, file); |
274 | security_file_free(file); | 278 | security_file_free(file); |