From 54b10d70d60eb2ead81d569235c41e76741914dd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 17 Jul 2007 04:04:32 -0700 Subject: [PATCH] --- yaml --- r: 60817 b: refs/heads/master c: fb66a1989c8abc3015aa334f617658b277e5fe98 h: refs/heads/master i: 60815: ed37d1468b4b0d9b36bf2c4bf48116b6623e6436 v: v3 --- [refs] | 2 +- trunk/fs/exportfs/expfs.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5aeeaf28be13..54e0e020b268 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7dd618a5901ce0b44ef518208b35f728775db74 +refs/heads/master: fb66a1989c8abc3015aa334f617658b277e5fe98 diff --git a/trunk/fs/exportfs/expfs.c b/trunk/fs/exportfs/expfs.c index abf0a316aa1a..085d6c547f44 100644 --- a/trunk/fs/exportfs/expfs.c +++ b/trunk/fs/exportfs/expfs.c @@ -37,6 +37,9 @@ static int exportfs_get_name(struct dentry *dir, char *name, return get_name(dir, name, child); } +/* + * Check if the dentry or any of it's aliases is acceptable. + */ static struct dentry * find_acceptable_alias(struct dentry *result, int (*acceptable)(void *context, struct dentry *dentry), @@ -44,6 +47,9 @@ find_acceptable_alias(struct dentry *result, { struct dentry *dentry, *toput = NULL; + if (acceptable(context, result)) + return result; + spin_lock(&dcache_lock); list_for_each_entry(dentry, &result->d_inode->i_dentry, d_alias) { dget_locked(dentry); @@ -126,9 +132,6 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent, target_dir = dget(result); } else { - if (acceptable(context, result)) - return result; - alias = find_acceptable_alias(result, acceptable, context); if (alias) return alias; @@ -289,9 +292,6 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent, } } dput(target_dir); - /* now result is properly connected, it is our best bet */ - if (acceptable(context, result)) - return result; alias = find_acceptable_alias(result, acceptable, context); if (alias)