diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-04-18 21:21:34 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-09 06:16:40 +0100 |
| commit | 40bd22c9f8617ddd5da06044c81f72a2cf700791 (patch) | |
| tree | 7969f179ac6e23c8fd1a9ea6bd4e9cc35ee1bfa6 /fs | |
| parent | vfs: don't use PARENT/CHILD lock classes for non-directories (diff) | |
| download | linux-40bd22c9f8617ddd5da06044c81f72a2cf700791.tar.xz linux-40bd22c9f8617ddd5da06044c81f72a2cf700791.zip | |
vfs: rename I_MUTEX_QUOTA now that it's not used for quotas
I_MUTEX_QUOTA is now just being used whenever we want to lock two
non-directories. So the name isn't right. I_MUTEX_NONDIR2 isn't
especially elegant but it's the best I could think of.
Also fix some outdated documentation.
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')
| -rw-r--r-- | fs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index 51f329b98aa4..ce48c359ce9e 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -957,10 +957,10 @@ void lock_two_nondirectories(struct inode *inode1, struct inode *inode2) WARN_ON_ONCE(S_ISDIR(inode2->i_mode)); if (inode1 < inode2) { mutex_lock(&inode1->i_mutex); - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_QUOTA); + mutex_lock_nested(&inode2->i_mutex, I_MUTEX_NONDIR2); } else { mutex_lock(&inode2->i_mutex); - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_QUOTA); + mutex_lock_nested(&inode1->i_mutex, I_MUTEX_NONDIR2); } } EXPORT_SYMBOL(lock_two_nondirectories); |