Commit 90db76e8 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext[34] tmpfile bugfix from Ted Ts'o:
 "Fix regression caused by commit af51a2ac which added ->tmpfile()
  support (along with a similar fix for ext3)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext3: fix a BUG when opening a file with O_TMPFILE flag
  ext4: fix a BUG when opening a file with O_TMPFILE flag
parents f6a0d9d5 dda5690d
...@@ -1780,11 +1780,11 @@ static int ext3_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -1780,11 +1780,11 @@ static int ext3_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
inode->i_op = &ext3_file_inode_operations; inode->i_op = &ext3_file_inode_operations;
inode->i_fop = &ext3_file_operations; inode->i_fop = &ext3_file_operations;
ext3_set_aops(inode); ext3_set_aops(inode);
d_tmpfile(dentry, inode);
err = ext3_orphan_add(handle, inode); err = ext3_orphan_add(handle, inode);
if (err) if (err)
goto err_drop_inode; goto err_drop_inode;
mark_inode_dirty(inode); mark_inode_dirty(inode);
d_tmpfile(dentry, inode);
unlock_new_inode(inode); unlock_new_inode(inode);
} }
ext3_journal_stop(handle); ext3_journal_stop(handle);
......
...@@ -2316,11 +2316,11 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -2316,11 +2316,11 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
inode->i_op = &ext4_file_inode_operations; inode->i_op = &ext4_file_inode_operations;
inode->i_fop = &ext4_file_operations; inode->i_fop = &ext4_file_operations;
ext4_set_aops(inode); ext4_set_aops(inode);
d_tmpfile(dentry, inode);
err = ext4_orphan_add(handle, inode); err = ext4_orphan_add(handle, inode);
if (err) if (err)
goto err_drop_inode; goto err_drop_inode;
mark_inode_dirty(inode); mark_inode_dirty(inode);
d_tmpfile(dentry, inode);
unlock_new_inode(inode); unlock_new_inode(inode);
} }
if (handle) if (handle)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment