diff options
| author | Christoph Hellwig <hch@infradead.org> | 2007-07-17 04:04:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 10:23:06 -0700 |
| commit | fb66a1989c8abc3015aa334f617658b277e5fe98 (patch) | |
| tree | e4216b8aa64bfb0376fa91f890fb03ae19803ac4 /fs | |
| parent | d7dd618a5901ce0b44ef518208b35f728775db74 (diff) | |
| download | talos-op-linux-fb66a1989c8abc3015aa334f617658b277e5fe98.tar.gz talos-op-linux-fb66a1989c8abc3015aa334f617658b277e5fe98.zip | |
knfsd: exportfs: move acceptable check into find_acceptable_alias
All callers of find_acceptable_alias check if the current dentry is acceptable
before looking for other acceptable aliases using find_acceptable_alias. Move
the check into find_acceptable_alias to make the code a little more dense and
add a comment to find_acceptable_alias that documents its intent.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exportfs/expfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index abf0a316aa1a..085d6c547f44 100644 --- a/fs/exportfs/expfs.c +++ b/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) |
