From: Wei Yongjun Date: Wed, 14 Oct 2009 12:54:03 +0000 (+0800) Subject: inotify: fix coalesce duplicate events into a single event in special case X-Git-Tag: v2.6.32-rc6~115^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3de0ef4f2067da58fa5126d821a56dcb98cdb565;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 Signed-off-by: Eric Paris --- diff --git a/fs/notify/notification.c b/fs/notify/notification.c index 3816d57..b8bf53b 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;