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.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 683a5b9ce22a..dcdec6fd33c6 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -85,7 +85,7 @@ static struct dentry *get_next_positive_subdir(struct dentry *prev,
85 spin_lock(&root->d_lock); 85 spin_lock(&root->d_lock);
86 86
87 if (prev) 87 if (prev)
88 next = prev->d_u.d_child.next; 88 next = prev->d_child.next;
89 else { 89 else {
90 prev = dget_dlock(root); 90 prev = dget_dlock(root);
91 next = prev->d_subdirs.next; 91 next = prev->d_subdirs.next;
@@ -99,13 +99,13 @@ cont:
99 return NULL; 99 return NULL;
100 } 100 }
101 101
102 q = list_entry(next, struct dentry, d_u.d_child); 102 q = list_entry(next, struct dentry, d_child);
103 103
104 spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED); 104 spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED);
105 /* Already gone or negative dentry (under construction) - try next */ 105 /* Already gone or negative dentry (under construction) - try next */
106 if (!d_count(q) || !simple_positive(q)) { 106 if (!d_count(q) || !simple_positive(q)) {
107 spin_unlock(&q->d_lock); 107 spin_unlock(&q->d_lock);
108 next = q->d_u.d_child.next; 108 next = q->d_child.next;
109 goto cont; 109 goto cont;
110 } 110 }
111 dget_dlock(q); 111 dget_dlock(q);
@@ -155,13 +155,13 @@ again:
155 goto relock; 155 goto relock;
156 } 156 }
157 spin_unlock(&p->d_lock); 157 spin_unlock(&p->d_lock);
158 next = p->d_u.d_child.next; 158 next = p->d_child.next;
159 p = parent; 159 p = parent;
160 if (next != &parent->d_subdirs) 160 if (next != &parent->d_subdirs)
161 break; 161 break;
162 } 162 }
163 } 163 }
164 ret = list_entry(next, struct dentry, d_u.d_child); 164 ret = list_entry(next, struct dentry, d_child);
165 165
166 spin_lock_nested(&ret->d_lock, DENTRY_D_LOCK_NESTED); 166 spin_lock_nested(&ret->d_lock, DENTRY_D_LOCK_NESTED);
167 /* Negative dentry - try next */ 167 /* Negative dentry - try next */
@@ -489,7 +489,7 @@ found:
489 spin_lock(&sbi->lookup_lock); 489 spin_lock(&sbi->lookup_lock);
490 spin_lock(&expired->d_parent->d_lock); 490 spin_lock(&expired->d_parent->d_lock);
491 spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED); 491 spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED);
492 list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child); 492 list_move(&expired->d_parent->d_subdirs, &expired->d_child);
493 spin_unlock(&expired->d_lock); 493 spin_unlock(&expired->d_lock);
494 spin_unlock(&expired->d_parent->d_lock); 494 spin_unlock(&expired->d_parent->d_lock);
495 spin_unlock(&sbi->lookup_lock); 495 spin_unlock(&sbi->lookup_lock);