Re: [PATCH] mds: remove waiting lock before merging with neighbours

From: Gregory Farnum <greg@inktank.com>
To: David Disseldorp <ddiss@suse.de>
Cc: "ceph-devel@vger.kernel.org" <ceph-devel@vger.kernel.org>
Subject: Re: [PATCH] mds: remove waiting lock before merging with neighbours
Date: Fri, 23 Aug 2013 13:58:56 -0700	[thread overview]
Message-ID: <CAPYLRzgeWsdxyqWNRykH1Ac+TChQwFh4PKmP7D81jc89YOZJ9w@mail.gmail.com> (raw)
In-Reply-To: <1375110344-26133-1-git-send-email-ddiss@suse.de>

Hi David,
I'm really sorry it took us so long to get back to you on this. :(
However, I've reviewed the patch and, apart from going over the code
making me want to strangle myself for structuring it that way,
everything looks good. I changed the last paragraph in the commit
message very slightly to clarify the cause of the bug:

On Mon, Jul 29, 2013 at 8:05 AM, David Disseldorp <ddiss@suse.de> wrote:
> When handling a lock request, the MDS calls adjust_locks() to merge
> the new lock with available neighbours. If the new lock is merged,
> then the waiting_locks entry is not located in the subsequent
> remove_waiting() call.
> This fix ensures that the waiting_locks entry is removed prior to
> modification during merge.

    When handling a lock request, the MDS calls adjust_locks() to merge
    the new lock with available neighbours. If the new lock is merged,
    then the waiting_locks entry is not located in the subsequent
    remove_waiting() call because adjust_locks changed the new lock to
    include the old locks.
    This fix ensures that the waiting_locks entry is removed prior to
    modification during merge.

And it's now merged into master and backported to dumpling. Thank you very much!

If you feel like cleaning up the locking code a little more (or
anything else, for that matter) I can promise you faster reviews in
the future... ;)
-Greg
Software Engineer #42 @ http://inktank.com | http://ceph.com