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

Commit fc411cf9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support" 



This reverts commit eb9e939d as there is
no need for it now that sdcardfs is gone.

Bug: 157700134
Cc: Daniel Rosenberg <drosen@google.com>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1c05f8fe02dca6f17d374cc1cd6fffb169391391
parent 0fb8b79a

fs/notify/inotify/inotify_user.c

+2 −13
Original line number Diff line number Diff line
@@ -702,8 +702,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;

include/linux/dcache.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,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);

include/linux/fsnotify.h

+0 −7
Original line number Diff line number Diff line
@@ -210,19 +210,12 @@ 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;



	if (S_ISDIR(inode->i_mode))

		mask |= FS_ISDIR;



	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_parent(path, NULL, mask);

	fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);

}