Patch "ceph: drop negative child dentries before try pruning inode's alias" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ceph: drop negative child dentries before try pruning inode's alias
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ceph-drop-negative-child-dentries-before-try-pruning-inode-s-alias.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
040d786032bf59002d374b86d75b04d97624005cMon Sep 17 00:00:00 2001
From: "Yan, Zheng" <[email protected]>
Date: Thu, 30 Nov 2017 11:59:22 +0800
Subject: ceph: drop negative child dentries before try pruning inode's alias
From: Yan, Zheng <[email protected]>
commit 040d786032bf59002d374b86d75b04d97624005c upstream.
Negative child dentry holds reference on inode's alias, it makes d_prune_aliases() do nothing.
--- fs/ceph/mds_client.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-)
fs/ceph/mds_client.c +38 -4
@@ -1396,6 +1396,29 @@ static int __close_session(struct ceph_mreturn request_close_session (mdsc, session); } +static bool drop_negative_children (struct dentry *dentry) +{ +struct dentry *child; +bool all_negative = true; + +if (!d_is_dir (dentry)) + goto out; + +spin_lock (&dentry->d_lock); +list_for_each_entry (child, &dentry->d_subdirs, d_child) { +if (d_really_is_positive (child)) { + all_negative = false; +break ; + } + } +spin_unlock (&dentry->d_lock); + +if (all_negative) +shrink_dcache_parent (dentry); +out: +return all_negative; +} +/* * Trim old(er) caps. *
@@ -1441,16 +1464,27 @@ static int trim_caps_cb(struct inode *inif ((used | wanted) & ~oissued & mine) goto out;/* we need these caps */ - session->s_trim_caps--;if (oissued) {/* we aren't the only cap.. just remove us */ __ceph_remove_cap (cap, true); + session->s_trim_caps--; }else { +struct dentry *dentry;/* try dropping referring dentries */ spin_unlock (&ci->i_ceph_lock); -d_prune_aliases (inode); -dout ("trim_caps_cb %p cap %p pruned, count now %d\n" , - inode, cap,atomic_read (&inode->i_count)); + dentry =d_find_any_alias (inode); +if (dentry &&drop_negative_children (dentry)) { +int count; +dput (dentry); +d_prune_aliases (inode); + count =atomic_read (&inode->i_count); +if (count ==1 ) + session->s_trim_caps--; +dout ("trim_caps_cb %p cap %p pruned, count now %d\n" , + inode, cap, count); + }else { +dput (dentry); + }return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/ceph-drop-negative-child-dentries-before-try-pruning-inode-s-alias.patch