* [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed
@ 2017-11-30 7:53 Yan, Zheng
2017-11-30 7:55 ` Yan, Zheng
2017-11-30 12:00 ` Jeff Layton
0 siblings, 2 replies; 3+ messages in thread
From: Yan, Zheng @ 2017-11-30 7:53 UTC (permalink / raw)
To: ceph-devel; +Cc: jlayton, Yan, Zheng, stable
d_prune_aliases() does not prune dentry that has non-zero reference
count. If we want trim_caps() to trim 'N' caps, the first 'N' inodes
in session->s_caps are all directories with child dentry, trim_caps()
can fail to trim anything.
Cc: stable@vger.kernel.org
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---
fs/ceph/mds_client.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 80339e278ad8..da181acd4a61 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1490,16 +1490,20 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
if ((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 {
+ int refs;
/* try dropping referring dentries */
spin_unlock(&ci->i_ceph_lock);
d_prune_aliases(inode);
+ refs = atomic_read(&inode->i_count);
+ if (refs == 1)
+ session->s_trim_caps--;
dout("trim_caps_cb %p cap %p pruned, count now %d\n",
- inode, cap, atomic_read(&inode->i_count));
+ inode, cap, refs);
return 0;
}
--
2.13.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed
2017-11-30 7:53 [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed Yan, Zheng
@ 2017-11-30 7:55 ` Yan, Zheng
2017-11-30 12:00 ` Jeff Layton
1 sibling, 0 replies; 3+ messages in thread
From: Yan, Zheng @ 2017-11-30 7:55 UTC (permalink / raw)
To: stable
Please ignore this mail.
> On 30 Nov 2017, at 15:53, Yan, Zheng <zyan@redhat.com> wrote:
>
> d_prune_aliases() does not prune dentry that has non-zero reference
> count. If we want trim_caps() to trim 'N' caps, the first 'N' inodes
> in session->s_caps are all directories with child dentry, trim_caps()
> can fail to trim anything.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
> ---
> fs/ceph/mds_client.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 80339e278ad8..da181acd4a61 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -1490,16 +1490,20 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
> if ((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 {
> + int refs;
> /* try dropping referring dentries */
> spin_unlock(&ci->i_ceph_lock);
> d_prune_aliases(inode);
> + refs = atomic_read(&inode->i_count);
> + if (refs == 1)
> + session->s_trim_caps--;
> dout("trim_caps_cb %p cap %p pruned, count now %d\n",
> - inode, cap, atomic_read(&inode->i_count));
> + inode, cap, refs);
> return 0;
> }
>
> --
> 2.13.6
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed
2017-11-30 7:53 [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed Yan, Zheng
2017-11-30 7:55 ` Yan, Zheng
@ 2017-11-30 12:00 ` Jeff Layton
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2017-11-30 12:00 UTC (permalink / raw)
To: Yan, Zheng, ceph-devel; +Cc: stable
On Thu, 2017-11-30 at 15:53 +0800, Yan, Zheng wrote:
> d_prune_aliases() does not prune dentry that has non-zero reference
> count. If we want trim_caps() to trim 'N' caps, the first 'N' inodes
> in session->s_caps are all directories with child dentry, trim_caps()
> can fail to trim anything.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
> ---
> fs/ceph/mds_client.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 80339e278ad8..da181acd4a61 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -1490,16 +1490,20 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
> if ((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 {
> + int refs;
> /* try dropping referring dentries */
> spin_unlock(&ci->i_ceph_lock);
> d_prune_aliases(inode);
> + refs = atomic_read(&inode->i_count);
> + if (refs == 1)
> + session->s_trim_caps--;
> dout("trim_caps_cb %p cap %p pruned, count now %d\n",
> - inode, cap, atomic_read(&inode->i_count));
> + inode, cap, refs);
> return 0;
> }
>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-30 12:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-30 7:53 [PATCH] ceph: decease session->s_trim_caps only after caps get trimmed Yan, Zheng
2017-11-30 7:55 ` Yan, Zheng
2017-11-30 12:00 ` Jeff Layton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).