lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: use RCU read side protection in d_validate

Browse Source 
d_validate does a purely read lookup in the dentry hash, so use RCU read side
locking instead of dcache_lock.  Split out from a larget patch by
Nick Piggin <npiggin@suse.de>.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig
2010-10-10 05:36:27 -04:00
committed by Al Viro
parent a4633357ac
commit 3825bdb7ed
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fs/dcache.c
View File

@@ -1491,33 +1491,26 @@ out:
* This is used by ncpfs in its readdir implementation. * This is used by ncpfs in its readdir implementation.
* Zero is returned in the dentry is invalid. * Zero is returned in the dentry is invalid.
*/ */
int d_validate(struct dentry *dentry, struct dentry *parent)
int d_validate(struct dentry *dentry, struct dentry *dparent)
{ {
struct hlist_head *base; struct hlist_head *head = d_hash(parent, dentry->d_name.hash);
struct hlist_node *lhp; struct hlist_node *node;
struct dentry *d;
/* Check whether the ptr might be valid at all.. */ /* Check whether the ptr might be valid at all.. */
if (!kmem_ptr_validate(dentry_cache, dentry)) if (!kmem_ptr_validate(dentry_cache, dentry))
goto out; return 0;
if (dentry->d_parent != parent)
return 0;
if (dentry->d_parent != dparent) rcu_read_lock();
goto out; hlist_for_each_entry_rcu(d, node, head, d_hash) {
if (d == dentry) {
spin_lock(&dcache_lock); dget(dentry);
base = d_hash(dparent, dentry->d_name.hash);
hlist_for_each(lhp,base) {
/* hlist_for_each_entry_rcu() not required for d_hash list
* as it is parsed under dcache_lock
*/
if (dentry == hlist_entry(lhp, struct dentry, d_hash)) {
__dget_locked(dentry);
spin_unlock(&dcache_lock);
return 1; return 1;
} }
} }
spin_unlock(&dcache_lock); rcu_read_unlock();
out:
return 0; return 0;
} }
EXPORT_SYMBOL(d_validate); EXPORT_SYMBOL(d_validate);