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/dcache.c | |
| 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/dcache.c')
| -rw-r--r-- | fs/dcache.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 7df640155468..750ddc627855 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1897,28 +1897,6 @@ struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode) EXPORT_SYMBOL(d_instantiate_unique); -/* - * This should be equivalent to d_instantiate() + unlock_new_inode(), - * with lockdep-related part of unlock_new_inode() done before - * anything else. Use that instead of open-coding d_instantiate()/ - * unlock_new_inode() combinations. - */ -void d_instantiate_new(struct dentry *entry, struct inode *inode) -{ - BUG_ON(!hlist_unhashed(&entry->d_u.d_alias)); - BUG_ON(!inode); - lockdep_annotate_inode_mutex_key(inode); - security_d_instantiate(entry, inode); - spin_lock(&inode->i_lock); - __d_instantiate(entry, inode); - WARN_ON(!(inode->i_state & I_NEW)); - inode->i_state &= ~I_NEW; - smp_mb(); - wake_up_bit(&inode->i_state, __I_NEW); - spin_unlock(&inode->i_lock); -} -EXPORT_SYMBOL(d_instantiate_new); - /** * d_instantiate_no_diralias - instantiate a non-aliased dentry * @entry: dentry to complete |