aboutsummaryrefslogtreecommitdiffstats
path: root/fs/autofs4/expire.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/autofs4/expire.c')
-rw-r--r--fs/autofs4/expire.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 968c1434af62..2f7951d67d16 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -102,7 +102,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
102 if (prev == NULL) 102 if (prev == NULL)
103 return dget(prev); 103 return dget(prev);
104 104
105 spin_lock(&dcache_lock); 105 spin_lock(&autofs4_lock);
106relock: 106relock:
107 p = prev; 107 p = prev;
108 spin_lock(&p->d_lock); 108 spin_lock(&p->d_lock);
@@ -114,7 +114,7 @@ again:
114 114
115 if (p == root) { 115 if (p == root) {
116 spin_unlock(&p->d_lock); 116 spin_unlock(&p->d_lock);
117 spin_unlock(&dcache_lock); 117 spin_unlock(&autofs4_lock);
118 dput(prev); 118 dput(prev);
119 return NULL; 119 return NULL;
120 } 120 }
@@ -144,7 +144,7 @@ again:
144 dget_dlock(ret); 144 dget_dlock(ret);
145 spin_unlock(&ret->d_lock); 145 spin_unlock(&ret->d_lock);
146 spin_unlock(&p->d_lock); 146 spin_unlock(&p->d_lock);
147 spin_unlock(&dcache_lock); 147 spin_unlock(&autofs4_lock);
148 148
149 dput(prev); 149 dput(prev);
150 150
@@ -408,13 +408,13 @@ found:
408 ino->flags |= AUTOFS_INF_EXPIRING; 408 ino->flags |= AUTOFS_INF_EXPIRING;
409 init_completion(&ino->expire_complete); 409 init_completion(&ino->expire_complete);
410 spin_unlock(&sbi->fs_lock); 410 spin_unlock(&sbi->fs_lock);
411 spin_lock(&dcache_lock); 411 spin_lock(&autofs4_lock);
412 spin_lock(&expired->d_parent->d_lock); 412 spin_lock(&expired->d_parent->d_lock);
413 spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED); 413 spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED);
414 list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child); 414 list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
415 spin_unlock(&expired->d_lock); 415 spin_unlock(&expired->d_lock);
416 spin_unlock(&expired->d_parent->d_lock); 416 spin_unlock(&expired->d_parent->d_lock);
417 spin_unlock(&dcache_lock); 417 spin_unlock(&autofs4_lock);
418 return expired; 418 return expired;
419} 419}
420 420