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

Commit 71c9ec24 authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

ANDROID: sdcardfs: Remove redundant operation 



We call get_derived_permission_new unconditionally, so we don't need
to call update_derived_permission_lock, which does the same thing.

Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Change-Id: I0748100828c6af806da807241a33bf42be614935
parent 992aef92

fs/sdcardfs/inode.c

+0 −12
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ static int sdcardfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct dentry *lower_new_dir_dentry = NULL;

	struct vfsmount *lower_mnt = NULL;

	struct dentry *trap = NULL;

	struct dentry *new_parent = NULL;

	struct path lower_old_path, lower_new_path;

	const struct cred *saved_cred = NULL;
@@ -520,17 +519,6 @@ static int sdcardfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (new_dir != old_dir) {

		sdcardfs_copy_and_fix_attrs(old_dir, d_inode(lower_old_dir_dentry));

		fsstack_copy_inode_size(old_dir, d_inode(lower_old_dir_dentry));



		/* update the derived permission of the old_dentry

		 * with its new parent

		 */

		new_parent = dget_parent(new_dentry);

		if(new_parent) {

			if(d_inode(old_dentry)) {

				update_derived_permission_lock(old_dentry);

			}

			dput(new_parent);

		}

	}

	/* At this point, not all dentry information has been moved, so

	 * we pass along new_dentry for the name.*/