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/udf | |
| 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/udf')
| -rw-r--r-- | fs/udf/namei.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index f34c545f4e54..c97b5a8d1e24 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -611,7 +611,8 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode) if (fibh.sbh != fibh.ebh) brelse(fibh.ebh); brelse(fibh.sbh); - d_instantiate_new(dentry, inode); + unlock_new_inode(inode); + d_instantiate(dentry, inode); return 0; } @@ -721,7 +722,8 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inc_nlink(dir); dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb); mark_inode_dirty(dir); - d_instantiate_new(dentry, inode); + unlock_new_inode(inode); + d_instantiate(dentry, inode); if (fibh.sbh != fibh.ebh) brelse(fibh.ebh); brelse(fibh.sbh); |