diff options
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index b056cf8271a5..86f52a555dec 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1398,7 +1398,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry) goto out; if (dentry->d_flags & DCACHE_SHRINK_LIST) { - data->found++; + goto out; } else { if (dentry->d_flags & DCACHE_LRU_LIST) d_lru_del(dentry); @@ -1898,28 +1898,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 |