From ce97c01ab3613176cce1c5af60cb6e743fc34844 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 May 2020 09:55:15 +0200 Subject: [PATCH] ANDROID: fix merge issue in fsnotify.h Youling reports that the fsnotify.h fixup done in 58dc0ef35a07 ("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: 58dc0ef35a07 ("ANDROID: Remove out-of-tree difference in fsnotify.h") Cc: Matthias Maennich Cc: Daniel Rosenberg Reported-by: youling 257 Signed-off-by: Greg Kroah-Hartman Change-Id: I23b5cb2d41b82e386a4f0620efec6b75e5b2d138 --- include/linux/fsnotify.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 5b50551c85f6..5ceeaacb78b2 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -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); }