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

Commit e4c99077 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: sdcardfs: Change current->fs under lock"

parents 55805884 48b08989

fs/sdcardfs/inode.c

+13 −2
Original line number Diff line number Diff line
@@ -95,8 +95,11 @@ static int sdcardfs_create(struct inode *dir, struct dentry *dentry, 
		err = -ENOMEM;

		goto out_unlock;

	}

	copied_fs->umask = 0;

	task_lock(current);

	current->fs = copied_fs;

	current->fs->umask = 0;

	task_unlock(current);



	err = vfs_create2(lower_dentry_mnt, d_inode(lower_parent_dentry), lower_dentry, mode, want_excl);

	if (err)

		goto out;
@@ -110,7 +113,9 @@ static int sdcardfs_create(struct inode *dir, struct dentry *dentry, 
	fixup_lower_ownership(dentry, dentry->d_name.name);



out:

	task_lock(current);

	current->fs = saved_fs;

	task_unlock(current);

	free_fs_struct(copied_fs);

out_unlock:

	unlock_dir(lower_parent_dentry);
@@ -316,8 +321,11 @@ static int sdcardfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode 
		unlock_dir(lower_parent_dentry);

		goto out_unlock;

	}

	copied_fs->umask = 0;

	task_lock(current);

	current->fs = copied_fs;

	current->fs->umask = 0;

	task_unlock(current);



	err = vfs_mkdir2(lower_mnt, d_inode(lower_parent_dentry), lower_dentry, mode);



	if (err) {
@@ -377,7 +385,10 @@ static int sdcardfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode 
		}

	}

out:

	task_lock(current);

	current->fs = saved_fs;

	task_unlock(current);



	free_fs_struct(copied_fs);

out_unlock:

	sdcardfs_put_lower_path(dentry, &lower_path);