diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
| commit | 1e82572e5f806782cc1bf06e6d22905c28b0a9f5 (patch) | |
| tree | c428a640fca2ee5c6bfe259482b941f5e0ece927 /fs/ecryptfs/inode.c | |
| parent | 29e8549d35499289ce6211a553f956a2ab9a3905 (diff) | |
| parent | 86a04ba0955e3c806ed301cf178f1e130f1cb785 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.05-rt
Diffstat (limited to 'fs/ecryptfs/inode.c')
| -rw-r--r-- | fs/ecryptfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index cf390dceddd2..5c5ff9f6fe07 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -284,8 +284,7 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry, iget_failed(ecryptfs_inode); goto out; } - unlock_new_inode(ecryptfs_inode); - d_instantiate(ecryptfs_dentry, ecryptfs_inode); + d_instantiate_new(ecryptfs_dentry, ecryptfs_inode); out: return rc; } |