diff options
| author | Daniel Rosenberg <drosen@google.com> | 2018-04-11 16:24:51 -0700 |
|---|---|---|
| committer | Daniel Rosenberg <drosen@google.com> | 2018-04-25 02:43:35 +0000 |
| commit | 1f0ab36725c4171e8e1aa7bcde7e3c642459eadf (patch) | |
| tree | 6719837da095115196bce01fc9a01907bae064c0 /fs | |
| parent | 86e6cbb5c6ae172e3a04ff69a91247c7b353ad15 (diff) | |
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: Daniel Rosenberg <drosen@google.com>
Bug: 77923821
Change-Id: I1abb4afb0f894ab917b7c6be8c833676f436beb7
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/sdcardfs/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/sdcardfs/main.c b/fs/sdcardfs/main.c index c3120108f627..1a977493f88d 100644 --- a/fs/sdcardfs/main.c +++ b/fs/sdcardfs/main.c @@ -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); |