diff options
author | Ian Kent <raven@themaw.net> | 2006-03-27 04:14:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:40 -0500 |
commit | 90a59c7cf5dd68b41ffab61dd30eba1ef5746e66 (patch) | |
tree | d8ba682efbeaf2153aea6484a822a0ce433880ed | |
parent | e77fbddf77c071a5735a4bc63a30649bd64baf14 (diff) |
[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>
-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 d82a019ff8ef..bc1b0543d2b6 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) | |||
201 | return dentry->d_inode && !d_unhashed(dentry); | 201 | return dentry->d_inode && !d_unhashed(dentry); |
202 | } | 202 | } |
203 | 203 | ||
204 | static inline int simple_empty_nolock(struct dentry *dentry) | 204 | static inline int __simple_empty(struct dentry *dentry) |
205 | { | 205 | { |
206 | struct dentry *child; | 206 | struct dentry *child; |
207 | int ret = 0; | 207 | int ret = 0; |
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 72dca3335e25..dcd4802a5d5f 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) | |||
343 | spin_lock(&dcache_lock); | 343 | spin_lock(&dcache_lock); |
344 | if (S_ISDIR(dentry->d_inode->i_mode) && | 344 | if (S_ISDIR(dentry->d_inode->i_mode) && |
345 | !d_mountpoint(dentry) && | 345 | !d_mountpoint(dentry) && |
346 | simple_empty_nolock(dentry)) { | 346 | __simple_empty(dentry)) { |
347 | DPRINTK("dentry=%p %.*s, emptydir", | 347 | DPRINTK("dentry=%p %.*s, emptydir", |
348 | dentry, dentry->d_name.len, dentry->d_name.name); | 348 | dentry, dentry->d_name.len, dentry->d_name.name); |
349 | spin_unlock(&dcache_lock); | 349 | spin_unlock(&dcache_lock); |