diff options
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 8086636bf796..0364af2311f4 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -389,7 +389,7 @@ static struct dentry *d_kill(struct dentry *dentry, struct dentry *parent) | |||
| 389 | * Inform try_to_ascend() that we are no longer attached to the | 389 | * Inform try_to_ascend() that we are no longer attached to the |
| 390 | * dentry tree | 390 | * dentry tree |
| 391 | */ | 391 | */ |
| 392 | dentry->d_flags |= DCACHE_DISCONNECTED; | 392 | dentry->d_flags |= DCACHE_DENTRY_KILLED; |
| 393 | if (parent) | 393 | if (parent) |
| 394 | spin_unlock(&parent->d_lock); | 394 | spin_unlock(&parent->d_lock); |
| 395 | dentry_iput(dentry); | 395 | dentry_iput(dentry); |
| @@ -1048,7 +1048,7 @@ static struct dentry *try_to_ascend(struct dentry *old, int locked, unsigned seq | |||
| 1048 | * or deletion | 1048 | * or deletion |
| 1049 | */ | 1049 | */ |
| 1050 | if (new != old->d_parent || | 1050 | if (new != old->d_parent || |
| 1051 | (old->d_flags & DCACHE_DISCONNECTED) || | 1051 | (old->d_flags & DCACHE_DENTRY_KILLED) || |
| 1052 | (!locked && read_seqretry(&rename_lock, seq))) { | 1052 | (!locked && read_seqretry(&rename_lock, seq))) { |
| 1053 | spin_unlock(&new->d_lock); | 1053 | spin_unlock(&new->d_lock); |
| 1054 | new = NULL; | 1054 | new = NULL; |
| @@ -1141,7 +1141,7 @@ rename_retry: | |||
| 1141 | EXPORT_SYMBOL(have_submounts); | 1141 | EXPORT_SYMBOL(have_submounts); |
| 1142 | 1142 | ||
| 1143 | /* | 1143 | /* |
| 1144 | * Search the dentry child list for the specified parent, | 1144 | * Search the dentry child list of the specified parent, |
| 1145 | * and move any unused dentries to the end of the unused | 1145 | * and move any unused dentries to the end of the unused |
| 1146 | * list for prune_dcache(). We descend to the next level | 1146 | * list for prune_dcache(). We descend to the next level |
| 1147 | * whenever the d_subdirs list is non-empty and continue | 1147 | * whenever the d_subdirs list is non-empty and continue |