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 /drivers/input | |
| 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 'drivers/input')
| -rw-r--r-- | drivers/input/evdev.c | 1 | ||||
| -rw-r--r-- | drivers/input/joydev.c | 1 | ||||
| -rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 13 | ||||
| -rw-r--r-- | drivers/input/mousedev.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/serio_raw.c | 1 |
5 files changed, 0 insertions, 17 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 3524bef62be6..1070db330d35 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -235,7 +235,6 @@ static int evdev_release(struct inode *inode, struct file *file) | |||
| 235 | evdev_ungrab(evdev, client); | 235 | evdev_ungrab(evdev, client); |
| 236 | mutex_unlock(&evdev->mutex); | 236 | mutex_unlock(&evdev->mutex); |
| 237 | 237 | ||
| 238 | evdev_fasync(-1, file, 0); | ||
| 239 | evdev_detach_client(evdev, client); | 238 | evdev_detach_client(evdev, client); |
| 240 | kfree(client); | 239 | kfree(client); |
| 241 | 240 | ||
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 65d7077a75a1..a85b1485e774 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -244,7 +244,6 @@ static int joydev_release(struct inode *inode, struct file *file) | |||
| 244 | struct joydev_client *client = file->private_data; | 244 | struct joydev_client *client = file->private_data; |
| 245 | struct joydev *joydev = client->joydev; | 245 | struct joydev *joydev = client->joydev; |
| 246 | 246 | ||
| 247 | joydev_fasync(-1, file, 0); | ||
| 248 | joydev_detach_client(joydev, client); | 247 | joydev_detach_client(joydev, client); |
| 249 | kfree(client); | 248 | kfree(client); |
| 250 | 249 | ||
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 82ec6b1b6467..216a559f55ea 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c | |||
| @@ -71,7 +71,6 @@ static int hp_sdc_rtc_ioctl(struct inode *inode, struct file *file, | |||
| 71 | static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait); | 71 | static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait); |
| 72 | 72 | ||
| 73 | static int hp_sdc_rtc_open(struct inode *inode, struct file *file); | 73 | static int hp_sdc_rtc_open(struct inode *inode, struct file *file); |
| 74 | static int hp_sdc_rtc_release(struct inode *inode, struct file *file); | ||
| 75 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on); | 74 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on); |
| 76 | 75 | ||
| 77 | static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off, | 76 | static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off, |
| @@ -414,17 +413,6 @@ static int hp_sdc_rtc_open(struct inode *inode, struct file *file) | |||
| 414 | return 0; | 413 | return 0; |
| 415 | } | 414 | } |
| 416 | 415 | ||
| 417 | static int hp_sdc_rtc_release(struct inode *inode, struct file *file) | ||
| 418 | { | ||
| 419 | /* Turn off interrupts? */ | ||
| 420 | |||
| 421 | if (file->f_flags & FASYNC) { | ||
| 422 | hp_sdc_rtc_fasync (-1, file, 0); | ||
| 423 | } | ||
| 424 | |||
| 425 | return 0; | ||
| 426 | } | ||
| 427 | |||
| 428 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on) | 416 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on) |
| 429 | { | 417 | { |
| 430 | return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue); | 418 | return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue); |
| @@ -680,7 +668,6 @@ static const struct file_operations hp_sdc_rtc_fops = { | |||
| 680 | .poll = hp_sdc_rtc_poll, | 668 | .poll = hp_sdc_rtc_poll, |
| 681 | .ioctl = hp_sdc_rtc_ioctl, | 669 | .ioctl = hp_sdc_rtc_ioctl, |
| 682 | .open = hp_sdc_rtc_open, | 670 | .open = hp_sdc_rtc_open, |
| 683 | .release = hp_sdc_rtc_release, | ||
| 684 | .fasync = hp_sdc_rtc_fasync, | 671 | .fasync = hp_sdc_rtc_fasync, |
| 685 | }; | 672 | }; |
| 686 | 673 | ||
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 8137e50ded87..d8c056fe7e98 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -519,7 +519,6 @@ static int mousedev_release(struct inode *inode, struct file *file) | |||
| 519 | struct mousedev_client *client = file->private_data; | 519 | struct mousedev_client *client = file->private_data; |
| 520 | struct mousedev *mousedev = client->mousedev; | 520 | struct mousedev *mousedev = client->mousedev; |
| 521 | 521 | ||
| 522 | mousedev_fasync(-1, file, 0); | ||
| 523 | mousedev_detach_client(mousedev, client); | 522 | mousedev_detach_client(mousedev, client); |
| 524 | kfree(client); | 523 | kfree(client); |
| 525 | 524 | ||
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 470770c09260..06bbd0e74c6f 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
| @@ -135,7 +135,6 @@ static int serio_raw_release(struct inode *inode, struct file *file) | |||
| 135 | 135 | ||
| 136 | mutex_lock(&serio_raw_mutex); | 136 | mutex_lock(&serio_raw_mutex); |
| 137 | 137 | ||
| 138 | serio_raw_fasync(-1, file, 0); | ||
| 139 | serio_raw_cleanup(serio_raw); | 138 | serio_raw_cleanup(serio_raw); |
| 140 | 139 | ||
| 141 | mutex_unlock(&serio_raw_mutex); | 140 | mutex_unlock(&serio_raw_mutex); |
