From: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
To: "J. Bruce Fields" <bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>,
linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
Dave Chinner <david-FqsqvQoI3Ljby3iVrkZq2A@public.gmane.org>
Subject: [PATCH 02/13--revised] vfs: don't use PARENT/CHILD lock classes for non-directories
Date: Wed, 11 Sep 2013 23:16:08 -0400 [thread overview]
Message-ID: <20130912031608.GD1462@fieldses.org> (raw)
In-Reply-To: <20130912031430.GC1462-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
From: "J. Bruce Fields" <bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
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.)
Acked-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: J. Bruce Fields <bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
fs/inode.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
> 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 the revised patch looks like this.
diff --git a/fs/inode.c b/fs/inode.c
index 20750b0..a8a8ded 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -990,16 +990,16 @@ 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));
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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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: [PATCH 02/13--revised] vfs: don't use PARENT/CHILD lock classes for non-directories
Date: Wed, 11 Sep 2013 23:16:08 -0400 [thread overview]
Message-ID: <20130912031608.GD1462@fieldses.org> (raw)
In-Reply-To: <20130912031430.GC1462@fieldses.org>
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.)
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/inode.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
> 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 the revised patch looks like this.
diff --git a/fs/inode.c b/fs/inode.c
index 20750b0..a8a8ded 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -990,16 +990,16 @@ 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));
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
next prev parent reply other threads:[~2013-09-12 3:16 UTC|newest]
Thread overview: 24+ 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 ` J. Bruce Fields
[not found] ` <1378929799-1110-1-git-send-email-bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
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 ` 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-11 20:03 ` J. Bruce Fields
[not found] ` <1378929799-1110-3-git-send-email-bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-09-12 3:14 ` J. Bruce Fields
2013-09-12 3:14 ` J. Bruce Fields
[not found] ` <20130912031430.GC1462-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-09-12 3:16 ` J. Bruce Fields [this message]
2013-09-12 3:16 ` [PATCH 02/13--revised] " J. Bruce Fields
2013-09-11 20:03 ` [PATCH 06/13] locks: implement delegations J. Bruce Fields
2013-09-11 20:03 ` 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 ` J. Bruce Fields
2013-09-11 20:03 ` [PATCH 13/13] locks: close potential race between setlease and open J. Bruce Fields
2013-09-11 20:03 ` 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 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
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=20130912031608.GD1462@fieldses.org \
--to=bfields-uc3wqj2krung9huczpvpmw@public.gmane.org \
--cc=bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=david-FqsqvQoI3Ljby3iVrkZq2A@public.gmane.org \
--cc=jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.