From ffea51ec1f7aabc06400be93092ccd3fcb84ea95 Mon Sep 17 00:00:00 2001 From: Alessio Balsini Date: Tue, 24 Nov 2020 16:04:37 +0000 Subject: [PATCH] ANDROID: vfs: d_canonical_path cleanup #if 0 Remove leftovers from previous rebase conflict. This change doesn't affect the kernel functionality as it deletes what already commented out but not removed by mistake. Fixes: f37e05049bf8 ("ANDROID: vfs: d_canonical_path for stacked FS") Signed-off-by: Alessio Balsini Change-Id: Ic536b8ededb56833c17a5aacdd444d3a162a149d --- include/linux/fsnotify.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 53314522c7f3..f8acddcf54fb 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -260,27 +260,12 @@ static inline void fsnotify_modify(struct file *file) */ static inline void fsnotify_open(struct file *file) { -#if 0 - const struct path *path = &file->f_path; - struct inode *inode = file_inode(file); - struct path lower_path; -#endif __u32 mask = FS_OPEN; if (file->f_flags & __FMODE_EXEC) mask |= FS_OPEN_EXEC; fsnotify_file(file, mask); -#if 0 - 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); -#endif } /*