diff options
| author | Eric Paris <eparis@redhat.com> | 2009-08-16 21:51:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-17 13:37:37 -0700 |
| commit | cd94c8bbef8d4b796a7ed4c551355a334604fd36 (patch) | |
| tree | ac448f253eb01a7fd1872daa15938b5d72fee796 /fs | |
| parent | eef3a116be11d35396efb2a8cc7345fd3221e294 (diff) | |
| download | kernel-crypto-cd94c8bbef8d4b796a7ed4c551355a334604fd36.tar.gz kernel-crypto-cd94c8bbef8d4b796a7ed4c551355a334604fd36.tar.xz kernel-crypto-cd94c8bbef8d4b796a7ed4c551355a334604fd36.zip | |
inotify: tail drop inotify q_overflow events
In f44aebcc the tail drop logic of events with no file backing
(q_overflow and in_ignored) was reversed so IN_IGNORED events would
never be tail dropped. This now means that Q_OVERFLOW events are NOT
tail dropped. The fix is to not tail drop IN_IGNORED, but to tail drop
Q_OVERFLOW.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/notify/notification.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/notify/notification.c b/fs/notify/notification.c index 74b3cf30bc6..3816d5750dd 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c @@ -153,6 +153,10 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *new return true; break; case (FSNOTIFY_EVENT_NONE): + if (old->mask & FS_Q_OVERFLOW) + return true; + else if (old->mask & FS_IN_IGNORED) + return false; return false; }; } |