Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

knfsd: exportfs: move acceptable check into find_acceptable_alias

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2007-07-17 04:04:32 -07:00 committed by Linus Torvalds
parent d7dd618a59
commit fb66a1989c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/exportfs/expfs.c
View file

@ -37,6 +37,9 @@ static int exportfs_get_name(struct dentry *dir, char *name,
return get_name(dir, name, child); return get_name(dir, name, child);
} }
/*
* Check if the dentry or any of it's aliases is acceptable.
*/
static struct dentry * static struct dentry *
find_acceptable_alias(struct dentry *result, find_acceptable_alias(struct dentry *result,
int (*acceptable)(void *context, struct dentry *dentry), int (*acceptable)(void *context, struct dentry *dentry),
@ -44,6 +47,9 @@ find_acceptable_alias(struct dentry *result,
{ {
struct dentry *dentry, *toput = NULL; struct dentry *dentry, *toput = NULL;
if (acceptable(context, result))
return result;
spin_lock(&dcache_lock); spin_lock(&dcache_lock);
list_for_each_entry(dentry, &result->d_inode->i_dentry, d_alias) { list_for_each_entry(dentry, &result->d_inode->i_dentry, d_alias) {
dget_locked(dentry); dget_locked(dentry);
@ -126,9 +132,6 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent,
target_dir = dget(result); target_dir = dget(result);
} else { } else {
if (acceptable(context, result))
return result;
alias = find_acceptable_alias(result, acceptable, context); alias = find_acceptable_alias(result, acceptable, context);
if (alias) if (alias)
return alias; return alias;
@ -289,9 +292,6 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent,
} }
} }
dput(target_dir); 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); alias = find_acceptable_alias(result, acceptable, context);
if (alias) if (alias)