diff options
Diffstat (limited to 'fs/ext3/namei.c')
-rw-r--r-- | fs/ext3/namei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index eeb63dfc5d20..8f4fddac01a6 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1011,7 +1011,7 @@ errout: | |||
1011 | return NULL; | 1011 | return NULL; |
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd) | 1014 | static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, unsigned int flags) |
1015 | { | 1015 | { |
1016 | struct inode * inode; | 1016 | struct inode * inode; |
1017 | struct ext3_dir_entry_2 * de; | 1017 | struct ext3_dir_entry_2 * de; |
@@ -1671,8 +1671,8 @@ static int ext3_add_nondir(handle_t *handle, | |||
1671 | int err = ext3_add_entry(handle, dentry, inode); | 1671 | int err = ext3_add_entry(handle, dentry, inode); |
1672 | if (!err) { | 1672 | if (!err) { |
1673 | ext3_mark_inode_dirty(handle, inode); | 1673 | ext3_mark_inode_dirty(handle, inode); |
1674 | d_instantiate(dentry, inode); | ||
1675 | unlock_new_inode(inode); | 1674 | unlock_new_inode(inode); |
1675 | d_instantiate(dentry, inode); | ||
1676 | return 0; | 1676 | return 0; |
1677 | } | 1677 | } |
1678 | drop_nlink(inode); | 1678 | drop_nlink(inode); |
@@ -1690,7 +1690,7 @@ static int ext3_add_nondir(handle_t *handle, | |||
1690 | * with d_instantiate(). | 1690 | * with d_instantiate(). |
1691 | */ | 1691 | */ |
1692 | static int ext3_create (struct inode * dir, struct dentry * dentry, umode_t mode, | 1692 | static int ext3_create (struct inode * dir, struct dentry * dentry, umode_t mode, |
1693 | struct nameidata *nd) | 1693 | bool excl) |
1694 | { | 1694 | { |
1695 | handle_t *handle; | 1695 | handle_t *handle; |
1696 | struct inode * inode; | 1696 | struct inode * inode; |
@@ -1836,8 +1836,8 @@ out_clear_inode: | |||
1836 | if (err) | 1836 | if (err) |
1837 | goto out_clear_inode; | 1837 | goto out_clear_inode; |
1838 | 1838 | ||
1839 | d_instantiate(dentry, inode); | ||
1840 | unlock_new_inode(inode); | 1839 | unlock_new_inode(inode); |
1840 | d_instantiate(dentry, inode); | ||
1841 | out_stop: | 1841 | out_stop: |
1842 | brelse(dir_block); | 1842 | brelse(dir_block); |
1843 | ext3_journal_stop(handle); | 1843 | ext3_journal_stop(handle); |