From 61cb9f02b05f387c8be16c316aa621b8318ee919 Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Mon, 27 Mar 2006 01:14:50 -0800
Subject: [PATCH] --- yaml --- r: 24251 b: refs/heads/master c:
 90a59c7cf5dd68b41ffab61dd30eba1ef5746e66 h: refs/heads/master i:   24249:
 b09459dec2b9d15fd20eb8ba0a14d3d88f44f062   24247:
 ce766eea8bb1e7ecf7ce3ed1439aea5084de14c4 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/autofs4/autofs_i.h | 2 +-
 trunk/fs/autofs4/root.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 835a63221c8c..6deb6d89e7c6 100644
--- 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
index d82a019ff8ef..bc1b0543d2b6 100644
--- 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
index 72dca3335e25..dcd4802a5d5f 100644
--- 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);