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 af51a2ac36d1f 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

2 files changed, 2 insertions, 2 deletions

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 998ea111e537..1194b1f0f839 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1780,11 +1780,11 @@ retry:
                 inode->i_op = &ext3_file_inode_operations;
                 inode->i_fop = &ext3_file_operations;
                 ext3_set_aops(inode);
+                d_tmpfile(dentry, inode);
                 err = ext3_orphan_add(handle, inode);
                 if (err)
                         goto err_drop_inode;
                 mark_inode_dirty(inode);
-                d_tmpfile(dentry, inode);
                 unlock_new_inode(inode);
         }
         ext3_journal_stop(handle);
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 234b834d5a97..35f55a0dbc4b 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2316,11 +2316,11 @@ retry:
                 inode->i_op = &ext4_file_inode_operations;
                 inode->i_fop = &ext4_file_operations;
                 ext4_set_aops(inode);
+                d_tmpfile(dentry, inode);
                 err = ext4_orphan_add(handle, inode);
                 if (err)
                         goto err_drop_inode;
                 mark_inode_dirty(inode);
-                d_tmpfile(dentry, inode);
                 unlock_new_inode(inode);
         }
         if (handle)