fs: dcache remove dcache_lock

[pandora-kernel.git] / fs / autofs4 / expire.c

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 968c143..2f7951d 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -102,7 +102,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
        if (prev == NULL)
                return dget(prev);
 
-       spin_lock(&dcache_lock);
+       spin_lock(&autofs4_lock);
 relock:
        p = prev;
        spin_lock(&p->d_lock);
@@ -114,7 +114,7 @@ again:
 
                        if (p == root) {
                                spin_unlock(&p->d_lock);
-                               spin_unlock(&dcache_lock);
+                               spin_unlock(&autofs4_lock);
                                dput(prev);
                                return NULL;
                        }
@@ -144,7 +144,7 @@ again:
        dget_dlock(ret);
        spin_unlock(&ret->d_lock);
        spin_unlock(&p->d_lock);
-       spin_unlock(&dcache_lock);
+       spin_unlock(&autofs4_lock);
 
        dput(prev);
 
@@ -408,13 +408,13 @@ found:
        ino->flags |= AUTOFS_INF_EXPIRING;
        init_completion(&ino->expire_complete);
        spin_unlock(&sbi->fs_lock);
-       spin_lock(&dcache_lock);
+       spin_lock(&autofs4_lock);
        spin_lock(&expired->d_parent->d_lock);
        spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED);
        list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
        spin_unlock(&expired->d_lock);
        spin_unlock(&expired->d_parent->d_lock);
-       spin_unlock(&dcache_lock);
+       spin_unlock(&autofs4_lock);
        return expired;
 }