diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2008-10-31 23:28:30 +0000 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:49:46 -0700 | 
| commit | 233e70f4228e78eb2f80dc6650f65d3ae3dbf17c (patch) | |
| tree | 4e18fbe1851e6d2161b7f18265cb21f8a61e3ce7 /drivers/input | |
| parent | 3318a386e4ca68c76e0294363d29bdc46fcad670 (diff) | |
| download | olio-linux-3.10-233e70f4228e78eb2f80dc6650f65d3ae3dbf17c.tar.xz olio-linux-3.10-233e70f4228e78eb2f80dc6650f65d3ae3dbf17c.zip  | |
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 3524bef62be..1070db330d3 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)  		evdev_ungrab(evdev, client);  	mutex_unlock(&evdev->mutex); -	evdev_fasync(-1, file, 0);  	evdev_detach_client(evdev, client);  	kfree(client); diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 65d7077a75a..a85b1485e77 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)  	struct joydev_client *client = file->private_data;  	struct joydev *joydev = client->joydev; -	joydev_fasync(-1, file, 0);  	joydev_detach_client(joydev, client);  	kfree(client); diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 82ec6b1b646..216a559f55e 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,  static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait);  static int hp_sdc_rtc_open(struct inode *inode, struct file *file); -static int hp_sdc_rtc_release(struct inode *inode, struct file *file);  static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on);  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)          return 0;  } -static int hp_sdc_rtc_release(struct inode *inode, struct file *file) -{ -	/* Turn off interrupts? */ - -        if (file->f_flags & FASYNC) { -                hp_sdc_rtc_fasync (-1, file, 0); -        } - -        return 0; -} -  static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on)  {          return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue); @@ -680,7 +668,6 @@ static const struct file_operations hp_sdc_rtc_fops = {          .poll =		hp_sdc_rtc_poll,          .ioctl =	hp_sdc_rtc_ioctl,          .open =		hp_sdc_rtc_open, -        .release =	hp_sdc_rtc_release,          .fasync =	hp_sdc_rtc_fasync,  }; diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 8137e50ded8..d8c056fe7e9 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)  	struct mousedev_client *client = file->private_data;  	struct mousedev *mousedev = client->mousedev; -	mousedev_fasync(-1, file, 0);  	mousedev_detach_client(mousedev, client);  	kfree(client); diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 470770c0926..06bbd0e74c6 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)  	mutex_lock(&serio_raw_mutex); -	serio_raw_fasync(-1, file, 0);  	serio_raw_cleanup(serio_raw);  	mutex_unlock(&serio_raw_mutex);  |