github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: fix merge issue in fsnotify.h

Browse Source 
Youling reports that the fsnotify.h fixup done in 58dc0ef35a
("ANDROID: Remove out-of-tree difference in fsnotify.h") might not have
been completly correct.

So try to fix this up by passing down lower_path in the call to
fsnotify_parent() in fsnotify_open().

Fixes: 58dc0ef35a ("ANDROID: Remove out-of-tree difference in fsnotify.h")
Cc: Matthias Maennich <maennich@google.com>
Cc: Daniel Rosenberg <drosen@google.com>
Reported-by: youling 257 <youling257@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I23b5cb2d41b82e386a4f0620efec6b75e5b2d138
This commit is contained in:
Greg Kroah-Hartman 2020-05-08 09:55:15 +02:00
parent dc419bab74
commit ce97c01ab3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/fsnotify.h
View File

@ -271,7 +271,8 @@ static inline void fsnotify_open(struct file *file)
if (path->dentry->d_op && path->dentry->d_op->d_canonical_path) {
path->dentry->d_op->d_canonical_path(path, &lower_path);
fsnotify_parent(lower_path.dentry, mask, NULL, FSNOTIFY_EVENT_PATH);
fsnotify_parent(lower_path.dentry, mask, &lower_path,
FSNOTIFY_EVENT_PATH);
fsnotify(lower_path.dentry->d_inode, mask, &lower_path, FSNOTIFY_EVENT_PATH, NULL, 0);
path_put(&lower_path);
}