diff options
| author | Gustavo Solaira <gustavos@codeaurora.org> | 2018-07-03 16:02:32 -0700 |
|---|---|---|
| committer | Gustavo Solaira <gustavos@codeaurora.org> | 2018-07-03 16:23:54 -0700 |
| commit | a97cb8dfea412ac4d42e1abcf9ed4ab0f8ebcbb3 (patch) | |
| tree | 9e8168da9c846fc7eff1c43a4086036258ca7235 /fs/f2fs | |
| parent | 642d3ae98bb49b7abacea7d120f81921755de3a0 (diff) | |
Revert "do d_instantiate/unlock_new_inode combinations safely"
This reverts commit 03bb7588942a38623f108b3302c2d1aebb525696.
Causes oops with security smack enabled.
Change-Id: I14fb2b0841c6b71940bd3f08bd4b49b1d7b039a3
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/namei.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 0355891dbbf8..5ec20f077629 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -294,7 +294,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, alloc_nid_done(sbi, ino); - d_instantiate_new(dentry, inode); + d_instantiate(dentry, inode); + unlock_new_inode(inode); if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); @@ -593,7 +594,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, err = page_symlink(inode, disk_link.name, disk_link.len); err_out: - d_instantiate_new(dentry, inode); + d_instantiate(dentry, inode); + unlock_new_inode(inode); /* * Let's flush symlink data in order to avoid broken symlink as much as @@ -656,7 +658,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) alloc_nid_done(sbi, inode->i_ino); - d_instantiate_new(dentry, inode); + d_instantiate(dentry, inode); + unlock_new_inode(inode); if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); @@ -707,7 +710,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry, alloc_nid_done(sbi, inode->i_ino); - d_instantiate_new(dentry, inode); + d_instantiate(dentry, inode); + unlock_new_inode(inode); if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); |