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

Commit 61100328 authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

ANDROID: sdcardfs: d_make_root calls iput 



d_make_root will call iput on failure, so we
shouldn't try to do that ourselves.

Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Bug: 77923821
Change-Id: I1abb4afb0f894ab917b7c6be8c833676f436beb7
parent 4fe4a4b7

fs/sdcardfs/main.c

+1 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int sdcardfs_read_super(struct vfsmount *mnt, struct super_block *sb, 
	sb->s_root = d_make_root(inode);

	if (!sb->s_root) {

		err = -ENOMEM;

		goto out_iput;

		goto out_sput;

	}

	d_set_d_op(sb->s_root, &sdcardfs_ci_dops);
@@ -361,8 +361,6 @@ static int sdcardfs_read_super(struct vfsmount *mnt, struct super_block *sb, 
	/* no longer needed: free_dentry_private_data(sb->s_root); */

out_freeroot:

	dput(sb->s_root);

out_iput:

	iput(inode);

out_sput:

	/* drop refs we took earlier */

	atomic_dec(&lower_sb->s_active);