diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-16 06:47:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 10:01:50 -0700 |
| commit | 1e89a5e15a2c88b3fd1ed3fa17fd767efe44727a (patch) | |
| tree | 840cb2badbbd568c44fa0ed2b3a467d3143381ea /fs/inode.c | |
| parent | e744fdea546abf7a794898a99a26f85c63a83648 (diff) | |
| download | blackbird-op-linux-1e89a5e15a2c88b3fd1ed3fa17fd767efe44727a.tar.gz blackbird-op-linux-1e89a5e15a2c88b3fd1ed3fa17fd767efe44727a.zip | |
lockdep: fixup the inode dir annotation
A slight oversight tripped lockdep debugging code, each lockdep
class should have but a single init site.
Rearange the code to make this true.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/inode.c b/fs/inode.c index f97de0aeb3b6..21dab18b2f18 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -568,16 +568,16 @@ EXPORT_SYMBOL(new_inode); void unlock_new_inode(struct inode *inode) { #ifdef CONFIG_DEBUG_LOCK_ALLOC - struct file_system_type *type = inode->i_sb->s_type; - /* - * ensure nobody is actually holding i_mutex - */ - mutex_destroy(&inode->i_mutex); - mutex_init(&inode->i_mutex); - if (inode->i_mode & S_IFDIR) + if (inode->i_mode & S_IFDIR) { + struct file_system_type *type = inode->i_sb->s_type; + + /* + * ensure nobody is actually holding i_mutex + */ + mutex_destroy(&inode->i_mutex); + mutex_init(&inode->i_mutex); lockdep_set_class(&inode->i_mutex, &type->i_mutex_dir_key); - else - lockdep_set_class(&inode->i_mutex, &type->i_mutex_key); + } #endif /* * This is special! We do not need the spinlock |
