From: "J. Bruce Fields" <bfields@fieldses.org>
To: "J. Bruce Fields" <bfields@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
jlayton@redhat.com, Dave Chinner <david@fromorbit.com>
Subject: Re: [PATCH 02/13] vfs: don't use PARENT/CHILD lock classes for non-directories
Date: Wed, 11 Sep 2013 23:14:30 -0400 [thread overview]
Message-ID: <20130912031430.GC1462@fieldses.org> (raw)
In-Reply-To: <1378929799-1110-3-git-send-email-bfields@redhat.com>
On Wed, Sep 11, 2013 at 04:03:08PM -0400, J. Bruce Fields wrote:
> From: "J. Bruce Fields" <bfields@redhat.com>
>
> Reserve I_MUTEX_PARENT and I_MUTEX_CHILD for locking of actual
> directories.
>
> (Also I_MUTEX_QUOTA isn't really a meaningful name for this locking
> class any more; fixed in a later patch.)
Argh, apologies! Revising this patch at one point I forgot to fix up
one line, and I somehow overlooked the resulting lockdep warning till
just now.
So it also needs a chunk like:
@@ -990,7 +990,7 @@ void lock_two_nondirectories(struct inode *inode1, struct inode *inode2)
{
WARN_ON_ONCE(S_ISDIR(inode1->i_mode));
if (inode1 == inode2 || !inode2) {
- mutex_lock_nested(&inode1->i_mutex, I_MUTEX_PARENT);
+ mutex_lock(&inode1->i_mutex);
return;
}
WARN_ON_ONCE(S_ISDIR(inode2->i_mode));
--b.
>
> Acked-by: Jeff Layton <jlayton@redhat.com>
> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> ---
> fs/inode.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/inode.c b/fs/inode.c
> index 20750b0..9f50a7e 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -995,11 +995,11 @@ void lock_two_nondirectories(struct inode *inode1, struct inode *inode2)
> }
> WARN_ON_ONCE(S_ISDIR(inode2->i_mode));
> if (inode1 < inode2) {
> - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_PARENT);
> - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_CHILD);
> + mutex_lock(&inode1->i_mutex);
> + mutex_lock_nested(&inode2->i_mutex, I_MUTEX_QUOTA);
> } else {
> - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_PARENT);
> - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_CHILD);
> + mutex_lock(&inode2->i_mutex);
> + mutex_lock_nested(&inode1->i_mutex, I_MUTEX_QUOTA);
> }
> }
> EXPORT_SYMBOL(lock_two_nondirectories);
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-09-12 3:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 20:03 [PATCH 00/13] Implement NFSv4 delegations, take 11 J. Bruce Fields
2013-09-11 20:03 ` [PATCH 01/13] vfs: pull ext4's double-i_mutex-locking into common code J. Bruce Fields
2013-09-11 20:03 ` [PATCH 02/13] vfs: don't use PARENT/CHILD lock classes for non-directories J. Bruce Fields
2013-09-12 3:14 ` J. Bruce Fields [this message]
2013-09-12 3:16 ` [PATCH 02/13--revised] " J. Bruce Fields
2013-09-11 20:03 ` [PATCH 03/13] vfs: rename I_MUTEX_QUOTA now that it's not used for quotas J. Bruce Fields
2013-09-11 20:03 ` [PATCH 04/13] vfs: take i_mutex on renamed file J. Bruce Fields
2013-09-11 20:03 ` [PATCH 05/13] locks: introduce new FL_DELEG lock flag J. Bruce Fields
2013-09-11 20:03 ` [PATCH 06/13] locks: implement delegations J. Bruce Fields
2013-09-11 20:03 ` [PATCH 07/13] namei: minor vfs_unlink cleanup J. Bruce Fields
2013-09-11 20:03 ` [PATCH 08/13] locks: break delegations on unlink J. Bruce Fields
2013-09-11 20:03 ` [PATCH 09/13] locks: helper functions for delegation breaking J. Bruce Fields
2013-09-11 20:03 ` [PATCH 10/13] locks: break delegations on rename J. Bruce Fields
2013-09-11 20:03 ` [PATCH 11/13] locks: break delegations on link J. Bruce Fields
2013-09-11 20:03 ` [PATCH 12/13] locks: break delegations on any attribute modification J. Bruce Fields
2013-09-11 20:03 ` [PATCH 13/13] locks: close potential race between setlease and open J. Bruce Fields
-- strict thread matches above, loose matches on Subject: below --
2013-09-19 20:50 [PATCH 00/13] Implement NFSv4 delegations, take 12 J. Bruce Fields
2013-09-19 20:50 ` [PATCH 02/13] vfs: don't use PARENT/CHILD lock classes for non-directories J. Bruce Fields
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=20130912031430.GC1462@fieldses.org \
--to=bfields@fieldses.org \
--cc=bfields@redhat.com \
--cc=david@fromorbit.com \
--cc=jlayton@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).