diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2008-10-31 19:28:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:49:46 -0400 |
commit | 233e70f4228e78eb2f80dc6650f65d3ae3dbf17c (patch) | |
tree | 4e18fbe1851e6d2161b7f18265cb21f8a61e3ce7 /fs/pipe.c | |
parent | 3318a386e4ca68c76e0294363d29bdc46fcad670 (diff) |
saner FASYNC handling on file close
As it is, all instances of ->release() for files that have ->fasync()
need to remember to evict file from fasync lists; forgetting that
creates a hole and we actually have a bunch that *does* forget.
So let's keep our lives simple - let __fput() check FASYNC in
file->f_flags and call ->fasync() there if it's been set. And lose that
crap in ->release() instances - leaving it there is still valid, but we
don't have to bother anymore.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -717,14 +717,12 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on) | |||
717 | static int | 717 | static int |
718 | pipe_read_release(struct inode *inode, struct file *filp) | 718 | pipe_read_release(struct inode *inode, struct file *filp) |
719 | { | 719 | { |
720 | pipe_read_fasync(-1, filp, 0); | ||
721 | return pipe_release(inode, 1, 0); | 720 | return pipe_release(inode, 1, 0); |
722 | } | 721 | } |
723 | 722 | ||
724 | static int | 723 | static int |
725 | pipe_write_release(struct inode *inode, struct file *filp) | 724 | pipe_write_release(struct inode *inode, struct file *filp) |
726 | { | 725 | { |
727 | pipe_write_fasync(-1, filp, 0); | ||
728 | return pipe_release(inode, 0, 1); | 726 | return pipe_release(inode, 0, 1); |
729 | } | 727 | } |
730 | 728 | ||
@@ -733,7 +731,6 @@ pipe_rdwr_release(struct inode *inode, struct file *filp) | |||
733 | { | 731 | { |
734 | int decr, decw; | 732 | int decr, decw; |
735 | 733 | ||
736 | pipe_rdwr_fasync(-1, filp, 0); | ||
737 | decr = (filp->f_mode & FMODE_READ) != 0; | 734 | decr = (filp->f_mode & FMODE_READ) != 0; |
738 | decw = (filp->f_mode & FMODE_WRITE) != 0; | 735 | decw = (filp->f_mode & FMODE_WRITE) != 0; |
739 | return pipe_release(inode, decr, decw); | 736 | return pipe_release(inode, decr, decw); |