---

yaml --- r: 24251 b: refs/heads/master c: 90a59c7 h: refs/heads/master i: 24249: b09459d 24247: ce766ee v: v3
git-mirror · Mar 27, 2006 · 61cb9f0 · 61cb9f0
1 parent 71bbc25
commit 61cb9f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e77fbddf77c071a5735a4bc63a30649bd64baf14
+refs/heads/master: 90a59c7cf5dd68b41ffab61dd30eba1ef5746e66
diff --git a/trunk/fs/autofs4/autofs_i.h b/trunk/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/trunk/fs/autofs4/root.c b/trunk/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);