diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 20:11:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 20:11:42 -0700 |
| commit | 90db76e829479ef2ba1fed8f2552846015469831 (patch) | |
| tree | 89fbb4eea90d27df20eef490ac9736c08c089eb2 | |
| parent | f6a0d9d585699d4ab634cfd26fa9ce9c7cb864a1 (diff) | |
| parent | dda5690defe4af62ee120f055e98e40d97e4c760 (diff) | |
| download | virtio-console-90db76e829479ef2ba1fed8f2552846015469831.tar.gz | |
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
| -rw-r--r-- | fs/ext3/namei.c | 2 | ||||
| -rw-r--r-- | fs/ext4/namei.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 998ea111e537e8..1194b1f0f8396c 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 234b834d5a9749..35f55a0dbc4b0b 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) |