diff options
| -rw-r--r-- | fs/autofs4/root.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index b6530f321adb..e8a8881c3f45 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
| @@ -419,23 +419,23 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) | |||
| 419 | head = &sbi->active_list; | 419 | head = &sbi->active_list; |
| 420 | list_for_each(p, head) { | 420 | list_for_each(p, head) { |
| 421 | struct autofs_info *ino; | 421 | struct autofs_info *ino; |
| 422 | struct dentry *dentry; | 422 | struct dentry *active; |
| 423 | struct qstr *qstr; | 423 | struct qstr *qstr; |
| 424 | 424 | ||
| 425 | ino = list_entry(p, struct autofs_info, active); | 425 | ino = list_entry(p, struct autofs_info, active); |
| 426 | dentry = ino->dentry; | 426 | active = ino->dentry; |
| 427 | 427 | ||
| 428 | spin_lock(&dentry->d_lock); | 428 | spin_lock(&active->d_lock); |
| 429 | 429 | ||
| 430 | /* Already gone? */ | 430 | /* Already gone? */ |
| 431 | if (atomic_read(&dentry->d_count) == 0) | 431 | if (atomic_read(&active->d_count) == 0) |
| 432 | goto next; | 432 | goto next; |
| 433 | 433 | ||
| 434 | qstr = &dentry->d_name; | 434 | qstr = &active->d_name; |
| 435 | 435 | ||
| 436 | if (dentry->d_name.hash != hash) | 436 | if (active->d_name.hash != hash) |
| 437 | goto next; | 437 | goto next; |
| 438 | if (dentry->d_parent != parent) | 438 | if (active->d_parent != parent) |
| 439 | goto next; | 439 | goto next; |
| 440 | 440 | ||
| 441 | if (qstr->len != len) | 441 | if (qstr->len != len) |
| @@ -443,15 +443,15 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) | |||
| 443 | if (memcmp(qstr->name, str, len)) | 443 | if (memcmp(qstr->name, str, len)) |
| 444 | goto next; | 444 | goto next; |
| 445 | 445 | ||
| 446 | if (d_unhashed(dentry)) { | 446 | if (d_unhashed(active)) { |
| 447 | dget(dentry); | 447 | dget(active); |
| 448 | spin_unlock(&dentry->d_lock); | 448 | spin_unlock(&active->d_lock); |
| 449 | spin_unlock(&sbi->lookup_lock); | 449 | spin_unlock(&sbi->lookup_lock); |
| 450 | spin_unlock(&dcache_lock); | 450 | spin_unlock(&dcache_lock); |
| 451 | return dentry; | 451 | return active; |
| 452 | } | 452 | } |
| 453 | next: | 453 | next: |
| 454 | spin_unlock(&dentry->d_lock); | 454 | spin_unlock(&active->d_lock); |
| 455 | } | 455 | } |
| 456 | spin_unlock(&sbi->lookup_lock); | 456 | spin_unlock(&sbi->lookup_lock); |
| 457 | spin_unlock(&dcache_lock); | 457 | spin_unlock(&dcache_lock); |
