Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/viro/vfs

Pull tmpfile fix from Al Viro:
 "A fix for double iput() in ->tmpfile() on ext3 and ext4; I'd fucked it
  up, Miklos has caught it"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext[34]: fix double put in tmpfile
  • Loading branch information
Linus Torvalds committed Oct 17, 2013
2 parents 8359ffa + 43ae9e3 commit 0056019
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions fs/ext3/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1783,18 +1783,17 @@ static int ext3_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
d_tmpfile(dentry, inode);
err = ext3_orphan_add(handle, inode);
if (err)
goto err_drop_inode;
goto err_unlock_inode;
mark_inode_dirty(inode);
unlock_new_inode(inode);
}
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
return err;
err_drop_inode:
err_unlock_inode:
ext3_journal_stop(handle);
unlock_new_inode(inode);
iput(inode);
return err;
}

Expand Down
5 changes: 2 additions & 3 deletions fs/ext4/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2319,7 +2319,7 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
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);
}
Expand All @@ -2328,10 +2328,9 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
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;
}

Expand Down

0 comments on commit 0056019

Please sign in to comment.