From: Ian Kent Rename the function simple_empty_nolock to __simple_empty in line with kernel naming conventions. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton --- fs/autofs4/autofs_i.h | 2 +- fs/autofs4/root.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/autofs4/autofs_i.h~autofs4-rename-simple_empty_nolock-function fs/autofs4/autofs_i.h --- devel/fs/autofs4/autofs_i.h~autofs4-rename-simple_empty_nolock-function 2006-01-18 18:23:11.000000000 -0800 +++ devel-akpm/fs/autofs4/autofs_i.h 2006-01-18 18:23:11.000000000 -0800 @@ -201,7 +201,7 @@ static inline int simple_positive(struct 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 -puN fs/autofs4/root.c~autofs4-rename-simple_empty_nolock-function fs/autofs4/root.c --- devel/fs/autofs4/root.c~autofs4-rename-simple_empty_nolock-function 2006-01-18 18:23:11.000000000 -0800 +++ devel-akpm/fs/autofs4/root.c 2006-01-18 18:23:11.000000000 -0800 @@ -343,7 +343,7 @@ static int autofs4_revalidate(struct den 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); _