diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2023-11-10 14:07:43 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2023-11-25 02:51:52 -0500 |
| commit | 1b327b5ac57cf83e3d015de45d0142852f475375 (patch) | |
| tree | 5d75a1520613c31169219bcff358fced3b65359f /fs/dcache.c | |
| parent | Merge branches 'work.dcache-misc' and 'work.dcache2' into work.dcache (diff) | |
| download | wireguard-linux-1b327b5ac57cf83e3d015de45d0142852f475375.tar.xz wireguard-linux-1b327b5ac57cf83e3d015de45d0142852f475375.zip | |
kill DCACHE_MAY_FREE
With the new ordering in __dentry_kill() it has become redundant -
it's set if and only if both DCACHE_DENTRY_KILLED and DCACHE_SHRINK_LIST
are set.
We set it in __dentry_kill(), after having set DCACHE_DENTRY_KILLED
with the only condition being that DCACHE_SHRINK_LIST is there;
all of that is done without dropping ->d_lock and the only place
that checks that flag (shrink_dentry_list()) does so under ->d_lock,
after having found the victim on its shrink list. Since DCACHE_SHRINK_LIST
is set only when placing dentry into shrink list and removed only by
shrink_dentry_list() itself, a check for DCACHE_DENTRY_KILLED in
there would be equivalent to check for DCACHE_MAY_FREE.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 475ef1edba03..523cbf0780f0 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -614,10 +614,8 @@ static struct dentry *__dentry_kill(struct dentry *dentry) } spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); dentry_unlist(dentry); - if (dentry->d_flags & DCACHE_SHRINK_LIST) { - dentry->d_flags |= DCACHE_MAY_FREE; + if (dentry->d_flags & DCACHE_SHRINK_LIST) can_free = false; - } spin_unlock(&dentry->d_lock); if (likely(can_free)) dentry_free(dentry); @@ -1072,7 +1070,7 @@ void shrink_dentry_list(struct list_head *list) bool can_free; rcu_read_unlock(); d_shrink_del(dentry); - can_free = dentry->d_flags & DCACHE_MAY_FREE; + can_free = dentry->d_flags & DCACHE_DENTRY_KILLED; spin_unlock(&dentry->d_lock); if (can_free) dentry_free(dentry); |