From: Luis Henriques <lhenriques@suse.de>
To: Jeff Layton <jlayton@kernel.org>
Cc: "Yan, Zheng" <ukernel@gmail.com>,
ceph-devel <ceph-devel@vger.kernel.org>,
Ilya Dryomov <idryomov@redhat.com>
Subject: Re: [RFC PATCH] ceph: guard against __ceph_remove_cap races
Date: Wed, 11 Nov 2020 14:34:58 +0000 [thread overview]
Message-ID: <87a6vodkrx.fsf@suse.de> (raw)
In-Reply-To: <49f1ee2a409c8f51594ada0605349d3b782d106b.camel@kernel.org> (Jeff Layton's message of "Wed, 11 Nov 2020 09:24:33 -0500")
Jeff Layton <jlayton@kernel.org> writes:
> On Wed, 2020-11-11 at 14:11 +0000, Luis Henriques wrote:
>>
>>
>
> It think this looks reasonable. Minor nits below:
>
>> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
>> index ded4229c314a..917dfaf0bd01 100644
>> --- a/fs/ceph/caps.c
>> +++ b/fs/ceph/caps.c
>> @@ -1140,12 +1140,17 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release)
>> {
>> struct ceph_mds_session *session = cap->session;
>> struct ceph_inode_info *ci = cap->ci;
>> - struct ceph_mds_client *mdsc =
>> - ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc;
>> + struct ceph_mds_client *mdsc;
>> +
>
> nit: remove the above newline
>
>> int removed = 0;
>>
>
> Maybe add a comment here to the effect that a NULL cap->ci indicates
> that the remove has already been done?
>
>> + if (!ci)
>> + return;
>> +
>> dout("__ceph_remove_cap %p from %p\n", cap, &ci->vfs_inode);
>>
>> + mdsc = ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc;
>> +
>
> There's a ceph_inode_to_client helper now that may make this a bit more
> readable.
>
>> /* remove from inode's cap rbtree, and clear auth cap */
>> rb_erase(&cap->ci_node, &ci->i_caps);
>> if (ci->i_auth_cap == cap) {
Thanks Jeff. I'll re-post this soon with your suggestions. I just want
to run some more local tests to make sure things aren't breaking with this
change.
Cheers,
--
Luis
prev parent reply other threads:[~2020-11-11 14:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191212173159.35013-1-jlayton@kernel.org>
[not found] ` <CAAM7YAmquOg5ESMAMa5y0gGAR-UAivYF8m+nqrJNmK=SzG6+wA@mail.gmail.com>
[not found] ` <64d5a16d920098122144e0df8e03df0cadfb2784.camel@kernel.org>
2020-11-11 11:08 ` [RFC PATCH] ceph: guard against __ceph_remove_cap races Luis Henriques
2020-11-11 13:09 ` Jeff Layton
2020-11-11 14:11 ` Luis Henriques
2020-11-11 14:24 ` Jeff Layton
2020-11-11 14:34 ` Luis Henriques [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a6vodkrx.fsf@suse.de \
--to=lhenriques@suse.de \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@redhat.com \
--cc=jlayton@kernel.org \
--cc=ukernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox