From 74594e1ba59c70e03ee40ea9faed3836cf97b439 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 29 May 2020 11:16:02 +0200 Subject: [PATCH] Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support" This reverts commit b05bef535d7dba4c3ecc22eb624cf62d6b2e5f12 as there is no need for it as sdcardfs is now gone. Bug: 157700134 Cc: Daniel Rosenberg Cc: Alistair Strachan Cc: Yongqin Liu Signed-off-by: Greg Kroah-Hartman Change-Id: I7c9e868d641d6e3e07d36a9a2cbe97a9b01f0ef4 --- fs/notify/inotify/inotify_user.c | 15 ++------------- include/linux/dcache.h | 2 +- include/linux/fsnotify.h | 7 ------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 68c06ad4f952..6f374518b607 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -701,8 +701,6 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname, struct fsnotify_group *group; struct inode *inode; struct path path; - struct path alteredpath; - struct path *canonical_path = &path; struct fd f; int ret; unsigned flags = 0; @@ -749,22 +747,13 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname, if (ret) goto fput_and_out; - /* support stacked filesystems */ - if(path.dentry && path.dentry->d_op) { - if (path.dentry->d_op->d_canonical_path) { - path.dentry->d_op->d_canonical_path(&path, &alteredpath); - canonical_path = &alteredpath; - path_put(&path); - } - } - /* inode held in place by reference to path; group by fget on fd */ - inode = canonical_path->dentry->d_inode; + inode = path.dentry->d_inode; group = f.file->private_data; /* create/update an inode mark */ ret = inotify_update_watch(group, inode, mask); - path_put(canonical_path); + path_put(&path); fput_and_out: fdput(f); return ret; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index efade9a770ae..a96334500f39 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -151,7 +151,7 @@ struct dentry_operations { struct vfsmount *(*d_automount)(struct path *); int (*d_manage)(const struct path *, bool); struct dentry *(*d_real)(struct dentry *, const struct inode *); - void (*d_canonical_path)(const struct path *, struct path *); + ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(3); diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index e018872b047c..a2d5d175d3c1 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -262,7 +262,6 @@ static inline void fsnotify_modify(struct file *file) static inline void fsnotify_open(struct file *file) { const struct path *path = &file->f_path; - struct path lower_path; struct inode *inode = file_inode(file); __u32 mask = FS_OPEN; @@ -271,12 +270,6 @@ static inline void fsnotify_open(struct file *file) if (file->f_flags & __FMODE_EXEC) mask |= FS_OPEN_EXEC; - 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, NULL, mask); - fsnotify(lower_path.dentry->d_inode, mask, &lower_path, FSNOTIFY_EVENT_PATH, NULL, 0); - path_put(&lower_path); - } fsnotify_path(inode, path, mask); }