From: Nick Piggin Date: Sun, 10 Oct 2010 09:36:24 +0000 (-0400) Subject: fs: improve DCACHE_REFERENCED usage X-Git-Tag: v2.6.37-rc1~94^2~13 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=265ac90230257e9c035e4b0c63a0c11c5336e93c;p=~shefty%2Frdma-dev.git fs: improve DCACHE_REFERENCED usage dentry referenced bit is only set when installing the dentry back onto the LRU. However with lazy LRU, the dentry can already be on the LRU list at dput time, thus missing out on setting the referenced bit. Fix this. Signed-off-by: Nick Piggin Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro --- diff --git a/fs/dcache.c b/fs/dcache.c index c37a656802b..1a976d4efbe 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -246,13 +246,16 @@ repeat: if (dentry->d_op->d_delete(dentry)) goto unhash_it; } + /* Unreachable? Get rid of it */ if (d_unhashed(dentry)) goto kill_it; - if (list_empty(&dentry->d_lru)) { - dentry->d_flags |= DCACHE_REFERENCED; + + /* Otherwise leave it cached and ensure it's on the LRU */ + dentry->d_flags |= DCACHE_REFERENCED; + if (list_empty(&dentry->d_lru)) dentry_lru_add(dentry); - } + spin_unlock(&dentry->d_lock); spin_unlock(&dcache_lock); return;