Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d53a040 authored Nov 19, 2018 by Alistair Strachan Committed by Alistair Delva Jul 19, 2019

ANDROID: fs: Restore vfs_path_lookup() export



Partial revert of 197df04c ("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 <astrachan@google.com>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

parent b05bef53

fs/internal.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

include/linux/namei.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);