diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-26 10:16:25 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-26 10:16:25 +0300 |
| commit | ed0d523adb5d05d6d7feea572c518e86ff8d1e96 (patch) | |
| tree | 9ff57c35631ce9d82130849775c72acc3a600e2f /fs/ext2/namei.c | |
| parent | 7a074e96dee62586c935c80cecd931431bfdd0be (diff) | |
| parent | 4faa99965e027cc057c5145ce45fa772caa04e8d (diff) | |
| download | linux-ed0d523adb5d05d6d7feea572c518e86ff8d1e96.tar.xz | |
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into aio-base
Diffstat (limited to 'fs/ext2/namei.c')
| -rw-r--r-- | fs/ext2/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index 55f7caadb093..152453a91877 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c @@ -41,8 +41,7 @@ static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode) { int err = ext2_add_link(dentry, inode); if (!err) { - unlock_new_inode(inode); - d_instantiate(dentry, inode); + d_instantiate_new(dentry, inode); return 0; } inode_dec_link_count(inode); @@ -255,8 +254,7 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) if (err) goto out_fail; - unlock_new_inode(inode); - d_instantiate(dentry, inode); + d_instantiate_new(dentry, inode); out: return err; |