diff options
| author | Tyler Hicks <tyhicks@canonical.com> | 2011-12-12 10:02:30 -0600 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-10 16:05:38 -0500 |
| commit | 978d6d8c4574098050b22281b9ed06818c0b23ca (patch) | |
| tree | 7186772f24633adc91ce02ab532da80eda329532 /fs/inode.c | |
| parent | c7b285550544c22bc005ec20978472c9ac7138c6 (diff) | |
| download | linux-stable-978d6d8c4574098050b22281b9ed06818c0b23ca.tar.gz linux-stable-978d6d8c4574098050b22281b9ed06818c0b23ca.tar.bz2 linux-stable-978d6d8c4574098050b22281b9ed06818c0b23ca.zip | |
vfs: Correctly set the dir i_mutex lockdep class
9a7aa12f3911853a introduced additional logic around setting the i_mutex
lockdep class for directory inodes. The idea was that some filesystems
may want their own special lockdep class for different directory
inodes and calling unlock_new_inode() should not clobber one of
those special classes.
I believe that the added conditional, around the *negated* return value
of lockdep_match_class(), caused directory inodes to be placed in the
wrong lockdep class.
inode_init_always() sets the i_mutex lockdep class with i_mutex_key for
all inodes. If the filesystem did not change the class during inode
initialization, then the conditional mentioned above was false and the
directory inode was incorrectly left in the non-directory lockdep class.
If the filesystem did set a special lockdep class, then the conditional
mentioned above was true and that class was clobbered with
i_mutex_dir_key.
This patch removes the negation from the conditional so that the i_mutex
lockdep class is properly set for directory inodes. Special classes are
preserved and directory inodes with unmodified classes are set with
i_mutex_dir_key.
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index d3ebdbe723d0..8affbc9c211b 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -938,8 +938,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode) struct file_system_type *type = inode->i_sb->s_type; /* Set new key only if filesystem hasn't already changed it */ - if (!lockdep_match_class(&inode->i_mutex, - &type->i_mutex_key)) { + if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) { /* * ensure nobody is actually holding i_mutex */ |