summaryrefslogtreecommitdiff
path: root/fs/notify
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2009-10-14 20:54:03 +0800
committerEric Paris <eparis@redhat.com>2009-10-18 15:49:38 -0400
commit3de0ef4f2067da58fa5126d821a56dcb98cdb565 (patch)
treed88103aaf3e5ed019afef5b11d4241ecf3eb1cea /fs/notify
parentcdc321ff0af78e818c97d4787f62bf52bdf9db2a (diff)
downloadlinux-3.10-3de0ef4f2067da58fa5126d821a56dcb98cdb565.tar.gz
linux-3.10-3de0ef4f2067da58fa5126d821a56dcb98cdb565.tar.bz2
linux-3.10-3de0ef4f2067da58fa5126d821a56dcb98cdb565.zip
inotify: fix coalesce duplicate events into a single event in special case
If we do rename a dir entry, like this: rename("/tmp/ino7UrgoJ.rename1", "/tmp/ino7UrgoJ.rename2") rename("/tmp/ino7UrgoJ.rename2", "/tmp/ino7UrgoJ") The duplicate events should be coalesced into a single event. But those two events do not be coalesced into a single event, due to some bad check in event_compare(). It can not match the two NULL inodes as the same event. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify')
-rw-r--r--fs/notify/notification.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index 3816d5750dd..b8bf53b4c10 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -143,7 +143,7 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *new
/* remember, after old was put on the wait_q we aren't
* allowed to look at the inode any more, only thing
* left to check was if the file_name is the same */
- if (old->name_len &&
+ if (!old->name_len ||
!strcmp(old->file_name, new->file_name))
return true;
break;