aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-10-10 16:48:19 +0200
committerMoyster <oysterized@gmail.com>2019-05-02 15:53:12 +0200
commitf6bce54bd4769d4ade6321542cc42de40933f27f (patch)
tree1da7dad45acb088ecec9e36d1f320280f4c2f50b /fs/ext4
parentf7e409c220d185764c93d496e45cb60e7de362cb (diff)
ext[34]: fix double put in tmpfile
d_tmpfile() already swallowed the inode ref. Change-Id: I22411f145d675948cff55b5a8cc3c0cd3a0d484c Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/namei.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 421110bb6..59b25d079 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2527,7 +2527,7 @@ retry:
d_tmpfile(dentry, inode);
err = ext4_orphan_add(handle, inode);
if (err)
- goto err_drop_inode;
+ goto err_unlock_inode;
mark_inode_dirty(inode);
unlock_new_inode(inode);
}
@@ -2536,10 +2536,9 @@ retry:
if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
goto retry;
return err;
-err_drop_inode:
+err_unlock_inode:
ext4_journal_stop(handle);
unlock_new_inode(inode);
- iput(inode);
return err;
}