git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lockd: per-net NSM client creation and destruction helpers introduced
[pandora-kernel.git]
/
fs
/
dcache.c
diff --git
a/fs/dcache.c
b/fs/dcache.c
index
8086636
..
16521a9
100644
(file)
--- a/
fs/dcache.c
+++ b/
fs/dcache.c
@@
-389,7
+389,7
@@
static struct dentry *d_kill(struct dentry *dentry, struct dentry *parent)
* Inform try_to_ascend() that we are no longer attached to the
* dentry tree
*/
* Inform try_to_ascend() that we are no longer attached to the
* dentry tree
*/
- dentry->d_flags |= DCACHE_D
ISCONNECT
ED;
+ dentry->d_flags |= DCACHE_D
ENTRY_KILL
ED;
if (parent)
spin_unlock(&parent->d_lock);
dentry_iput(dentry);
if (parent)
spin_unlock(&parent->d_lock);
dentry_iput(dentry);
@@
-1048,7
+1048,7
@@
static struct dentry *try_to_ascend(struct dentry *old, int locked, unsigned seq
* or deletion
*/
if (new != old->d_parent ||
* or deletion
*/
if (new != old->d_parent ||
- (old->d_flags & DCACHE_D
ISCONNECT
ED) ||
+ (old->d_flags & DCACHE_D
ENTRY_KILL
ED) ||
(!locked && read_seqretry(&rename_lock, seq))) {
spin_unlock(&new->d_lock);
new = NULL;
(!locked && read_seqretry(&rename_lock, seq))) {
spin_unlock(&new->d_lock);
new = NULL;