diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2020-07-08 13:11:41 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2020-07-15 17:36:58 +0200 |
| commit | 956235afd145e60094642fca83486c0f3ccaca16 (patch) | |
| tree | 4dd593b6a9c7de4f4ab24f53b1d428abc7c0ebf6 /fs/notify/inotify | |
| parent | kernfs: do not call fsnotify() with name without a parent (diff) | |
| download | linux-956235afd145e60094642fca83486c0f3ccaca16.tar.xz linux-956235afd145e60094642fca83486c0f3ccaca16.zip | |
inotify: do not use objectid when comparing events
inotify's event->wd is the object identifier.
Compare that instead of the common fsnotidy event objectid, so
we can get rid of the objectid field later.
Link: https://lore.kernel.org/r/20200708111156.24659-6-amir73il@gmail.com
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/inotify')
| -rw-r--r-- | fs/notify/inotify/inotify_fsnotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index 2ebc89047153..9b481460a2dc 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c @@ -39,7 +39,7 @@ static bool event_compare(struct fsnotify_event *old_fsn, if (old->mask & FS_IN_IGNORED) return false; if ((old->mask == new->mask) && - (old_fsn->objectid == new_fsn->objectid) && + (old->wd == new->wd) && (old->name_len == new->name_len) && (!old->name_len || !strcmp(old->name, new->name))) return true; @@ -116,7 +116,7 @@ int inotify_handle_event(struct fsnotify_group *group, mask &= ~IN_ISDIR; fsn_event = &event->fse; - fsnotify_init_event(fsn_event, (unsigned long)inode); + fsnotify_init_event(fsn_event, 0); event->mask = mask; event->wd = i_mark->wd; event->sync_cookie = cookie; |