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

Commit b6221e34 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Revert "ANDROID: Incremental fs: Fix selinux issues" 



This reverts commit 75c93eb4.

Reason for revert: rolling the three fixes into one with feature flag
Bug: 174692664
Test: incfs_test passes
Signed-off-by: default avatarPaul Lawrence <paullawrence@google.com>
Change-Id: I838bed85d6682aba44165a58c22e6a0e10c49d58
parent 0ade8c41

fs/incfs/vfs.c

+4 −7
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static int init_new_file(struct mount_info *mi, struct dentry *dentry, 
		.dentry = dentry

	};

	new_file = dentry_open(&path, O_RDWR | O_NOATIME | O_LARGEFILE,

			       current_cred());

			       mi->mi_owner);



	if (IS_ERR(new_file)) {

		error = PTR_ERR(new_file);
@@ -1026,7 +1026,7 @@ static int dir_relative_path_resolve( 
	if (dir_fd < 0)

		return dir_fd;



	dir_f = dentry_open(base_path, O_RDONLY | O_NOATIME, current_cred());

	dir_f = dentry_open(base_path, O_RDONLY | O_NOATIME, mi->mi_owner);



	if (IS_ERR(dir_f)) {

		error = PTR_ERR(dir_f);
@@ -1904,13 +1904,10 @@ static int file_open(struct inode *inode, struct file *file) 
	struct file *backing_file = NULL;

	struct path backing_path = {};

	int err = 0;

	const struct cred *old_cred;



	get_incfs_backing_path(file->f_path.dentry, &backing_path);

	old_cred = override_creds(mi->mi_owner);

	backing_file = dentry_open(&backing_path,

			O_RDWR | O_NOATIME | O_LARGEFILE, current_cred());

	revert_creds(old_cred);

	backing_file = dentry_open(

		&backing_path, O_RDWR | O_NOATIME | O_LARGEFILE, mi->mi_owner);

	path_put(&backing_path);



	if (IS_ERR(backing_file)) {