diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2012-04-25 07:19:52 -0400 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2013-11-09 00:16:39 -0500 |
| commit | 275555163e3ac09c016c964a10e0f389cf152c4c (patch) | |
| tree | 184c807a11d1c171d41f46964ae0c09ff8ed4733 /fs/inode.c | |
| parent | vfs: pull ext4's double-i_mutex-locking into common code (diff) | |
| download | linux-dev-275555163e3ac09c016c964a10e0f389cf152c4c.tar.xz linux-dev-275555163e3ac09c016c964a10e0f389cf152c4c.zip | |
vfs: don't use PARENT/CHILD lock classes for non-directories
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>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/inode.c b/fs/inode.c index ef25afdf3906..51f329b98aa4 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -951,16 +951,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); |