diff --git a/[refs] b/[refs] index d463b6d78fa7..590198551847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a154b2bb9b528a39ddc777399482c1fa27fdb8 +refs/heads/master: e8462caa915d4d12846db7aae2557b6db7c054d5 diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index d9ca1e5ceb92..1c323dd92fb2 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -89,7 +89,7 @@ static void d_free(struct dentry *dentry) if (dentry->d_op && dentry->d_op->d_release) dentry->d_op->d_release(dentry); /* if dentry was never inserted into hash, immediate free is OK */ - if (dentry->d_hash.pprev == NULL) + if (hlist_unhashed(&dentry->d_hash)) __d_free(dentry); else call_rcu(&dentry->d_u.d_rcu, d_callback);