1 files changed, 6 insertions, 2 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index cc87c1abac97..fb202cadd4b3 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -166,8 +166,10 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry)
         const unsigned char *str = name->name;
         struct list_head *p, *head;
 
-        spin_lock(&sbi->lookup_lock);
         head = &sbi->active_list;
+        if (list_empty(head))
+                return NULL;
+        spin_lock(&sbi->lookup_lock);
         list_for_each(p, head) {
                 struct autofs_info *ino;
                 struct dentry *active;
@@ -218,8 +220,10 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
         const unsigned char *str = name->name;
         struct list_head *p, *head;
 
-        spin_lock(&sbi->lookup_lock);
         head = &sbi->expiring_list;
+        if (list_empty(head))
+                return NULL;
+        spin_lock(&sbi->lookup_lock);
         list_for_each(p, head) {
                 struct autofs_info *ino;
                 struct dentry *expiring;