diff options
Diffstat (limited to 'fs/autofs4/expire.c')
-rw-r--r-- | fs/autofs4/expire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c index 13ddec92341c..3d9d3f5d5dda 100644 --- a/fs/autofs4/expire.c +++ b/fs/autofs4/expire.c | |||
@@ -109,7 +109,7 @@ cont: | |||
109 | 109 | ||
110 | spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED); | 110 | spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED); |
111 | /* Already gone or negative dentry (under construction) - try next */ | 111 | /* Already gone or negative dentry (under construction) - try next */ |
112 | if (q->d_count == 0 || !simple_positive(q)) { | 112 | if (!d_count(q) || !simple_positive(q)) { |
113 | spin_unlock(&q->d_lock); | 113 | spin_unlock(&q->d_lock); |
114 | next = q->d_u.d_child.next; | 114 | next = q->d_u.d_child.next; |
115 | goto cont; | 115 | goto cont; |
@@ -267,7 +267,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt, | |||
267 | else | 267 | else |
268 | ino_count++; | 268 | ino_count++; |
269 | 269 | ||
270 | if (p->d_count > ino_count) { | 270 | if (d_count(p) > ino_count) { |
271 | top_ino->last_used = jiffies; | 271 | top_ino->last_used = jiffies; |
272 | dput(p); | 272 | dput(p); |
273 | return 1; | 273 | return 1; |
@@ -409,7 +409,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, | |||
409 | if (!exp_leaves) { | 409 | if (!exp_leaves) { |
410 | /* Path walk currently on this dentry? */ | 410 | /* Path walk currently on this dentry? */ |
411 | ino_count = atomic_read(&ino->count) + 1; | 411 | ino_count = atomic_read(&ino->count) + 1; |
412 | if (dentry->d_count > ino_count) | 412 | if (d_count(dentry) > ino_count) |
413 | goto next; | 413 | goto next; |
414 | 414 | ||
415 | if (!autofs4_tree_busy(mnt, dentry, timeout, do_now)) { | 415 | if (!autofs4_tree_busy(mnt, dentry, timeout, do_now)) { |
@@ -423,7 +423,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, | |||
423 | } else { | 423 | } else { |
424 | /* Path walk currently on this dentry? */ | 424 | /* Path walk currently on this dentry? */ |
425 | ino_count = atomic_read(&ino->count) + 1; | 425 | ino_count = atomic_read(&ino->count) + 1; |
426 | if (dentry->d_count > ino_count) | 426 | if (d_count(dentry) > ino_count) |
427 | goto next; | 427 | goto next; |
428 | 428 | ||
429 | expired = autofs4_check_leaves(mnt, dentry, timeout, do_now); | 429 | expired = autofs4_check_leaves(mnt, dentry, timeout, do_now); |