From 4d53a0405c32f4e8d741e294cff4553b5fad2c0e Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Mon, 19 Nov 2018 22:38:23 -0800 Subject: [PATCH] ANDROID: fs: Restore vfs_path_lookup() export Partial revert of 197df04c749a ("rename user_path_umountat() to user_path_mountpoint_at()"), to restore access to vfs_path_lookup() without including fs/internal.h, as needed by sdcardfs. Test: HiKey/X15 + Pie + android-mainline, and HiKey + AOSP Maser + android-mainline, directories under /sdcard created, output of mount is right, CTS test collecting device infor works Change-Id: I757f2df9f4dcc66f633939e7833e6fa2ac0ff4f8 Signed-off-by: Alistair Strachan Signed-off-by: Yongqin Liu --- fs/internal.h | 2 -- include/linux/namei.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index a48ef81be37d..68e23279d709 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -63,8 +63,6 @@ extern int finish_clean_context(struct fs_context *fc); extern int filename_lookup(int dfd, struct filename *name, unsigned flags, struct path *path, struct path *root); extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *); -extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - const char *, unsigned int, struct path *); long do_mknodat(int dfd, const char __user *filename, umode_t mode, unsigned int dev); long do_mkdirat(int dfd, const char __user *pathname, umode_t mode); diff --git a/include/linux/namei.h b/include/linux/namei.h index 474b3c2de089..ff686a3989e9 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -82,6 +82,8 @@ extern struct dentry *kern_path_create(int, const char *, struct path *, unsigne extern struct dentry *user_path_create(int, const char __user *, struct path *, unsigned int); extern void done_path_create(struct path *, struct dentry *); extern struct dentry *kern_path_locked(const char *, struct path *); +extern int vfs_path_lookup(struct dentry *, struct vfsmount *, + const char *, unsigned int, struct path *); extern int kern_path_mountpoint(int, const char *, struct path *, unsigned int); extern struct dentry *try_lookup_one_len(const char *, struct dentry *, int);