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/jfs | |
| 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/jfs')
| -rw-r--r-- | fs/jfs/namei.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index f217ae750adb..9d7551f5c32a 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -178,7 +178,8 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode, unlock_new_inode(ip); iput(ip); } else { - d_instantiate_new(dentry, ip); + unlock_new_inode(ip); + d_instantiate(dentry, ip); } out2: @@ -312,7 +313,8 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode) unlock_new_inode(ip); iput(ip); } else { - d_instantiate_new(dentry, ip); + unlock_new_inode(ip); + d_instantiate(dentry, ip); } out2: @@ -1056,7 +1058,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, unlock_new_inode(ip); iput(ip); } else { - d_instantiate_new(dentry, ip); + unlock_new_inode(ip); + d_instantiate(dentry, ip); } out2: @@ -1440,7 +1443,8 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry, unlock_new_inode(ip); iput(ip); } else { - d_instantiate_new(dentry, ip); + unlock_new_inode(ip); + d_instantiate(dentry, ip); } out1: |