diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2020-06-09 16:30:37 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2020-06-10 17:01:22 +0530 |
| commit | 2ec7fab5db5f81427127da4ca4bf67064f2bbec1 (patch) | |
| tree | 477ebf2f2064f363d66975cdb463c688d1f6dcc5 | |
| parent | 3a8c5274b176d08954d4a6d2df53d4aa8637db70 (diff) | |
Revert "Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support""
This reverts commit 972cde43ff770d43987655d37bc49156c7c6f889.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | fs/notify/inotify/inotify_user.c | 15 | ||||
| -rw-r--r-- | include/linux/dcache.h | 1 | ||||
| -rw-r--r-- | include/linux/fsnotify.h | 9 |
3 files changed, 23 insertions, 2 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 6f374518b607..68c06ad4f952 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -701,6 +701,8 @@ 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; @@ -747,13 +749,22 @@ 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 = path.dentry->d_inode; + inode = canonical_path->dentry->d_inode; group = f.file->private_data; /* create/update an inode mark */ ret = inotify_update_watch(group, inode, mask); - path_put(&path); + path_put(canonical_path); fput_and_out: fdput(f); return ret; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index c1488cc84fd9..f23f9f790eac 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -147,6 +147,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 *); } ____cacheline_aligned; /* diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 5ab28f6c7d26..5ceeaacb78b2 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -262,11 +262,20 @@ 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; __u32 mask = FS_OPEN; 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.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); + } fsnotify_file(file, mask); } |