diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /fs/inotify_user.c | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'fs/inotify_user.c')
| -rw-r--r-- | fs/inotify_user.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c index d85c7d931cdf..d367e9b92862 100644 --- a/fs/inotify_user.c +++ b/fs/inotify_user.c | |||
| @@ -537,9 +537,6 @@ static int inotify_release(struct inode *ignored, struct file *file) | |||
| 537 | inotify_dev_event_dequeue(dev); | 537 | inotify_dev_event_dequeue(dev); |
| 538 | mutex_unlock(&dev->ev_mutex); | 538 | mutex_unlock(&dev->ev_mutex); |
| 539 | 539 | ||
| 540 | if (file->f_flags & FASYNC) | ||
| 541 | inotify_fasync(-1, file, 0); | ||
| 542 | |||
| 543 | /* free this device: the put matching the get in inotify_init() */ | 540 | /* free this device: the put matching the get in inotify_init() */ |
| 544 | put_inotify_dev(dev); | 541 | put_inotify_dev(dev); |
| 545 | 542 | ||