f2fs: Add a small clarification to CONFIG_FS_F2FS_FS_SECURITY

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index 695c096..e16a91d 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1394,7 +1394,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);
@@ -1903,7 +1903,6 @@ 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));
@@ -1911,6 +1910,7 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode)
        smp_mb();
        wake_up_bit(&inode->i_state, __I_NEW);
        spin_unlock(&inode->i_lock);
+       security_d_instantiate(entry, inode);
 }
 EXPORT_SYMBOL(d_instantiate_new);