diff options
author | Ian Kent <raven@themaw.net> | 2006-03-27 01:14:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:40 -0800 |
commit | 90a59c7cf5dd68b41ffab61dd30eba1ef5746e66 (patch) | |
tree | d8ba682efbeaf2153aea6484a822a0ce433880ed /fs | |
parent | e77fbddf77c071a5735a4bc63a30649bd64baf14 (diff) | |
download | kernel_samsung_smdk4412-90a59c7cf5dd68b41ffab61dd30eba1ef5746e66.tar.gz kernel_samsung_smdk4412-90a59c7cf5dd68b41ffab61dd30eba1ef5746e66.tar.bz2 kernel_samsung_smdk4412-90a59c7cf5dd68b41ffab61dd30eba1ef5746e66.zip |
[PATCH] autofs4: rename simple_empty_nolock function
Rename the function simple_empty_nolock to __simple_empty in line with kernel
naming conventions.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/autofs4/autofs_i.h | 2 | ||||
-rw-r--r-- | fs/autofs4/root.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index d82a019ff8e..bc1b0543d2b 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -201,7 +201,7 @@ static inline int simple_positive(struct dentry *dentry) return dentry->d_inode && !d_unhashed(dentry); } -static inline int simple_empty_nolock(struct dentry *dentry) +static inline int __simple_empty(struct dentry *dentry) { struct dentry *child; int ret = 0; diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 72dca3335e2..dcd4802a5d5 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -343,7 +343,7 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd) spin_lock(&dcache_lock); if (S_ISDIR(dentry->d_inode->i_mode) && !d_mountpoint(dentry) && - simple_empty_nolock(dentry)) { + __simple_empty(dentry)) { DPRINTK("dentry=%p %.*s, emptydir", dentry, dentry->d_name.len, dentry->d_name.name); spin_unlock(&dcache_lock); |