From 82a13c02f6a48881a492f838fff062f46f12e0ca Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Tue, 27 Apr 2010 14:23:57 -0700 Subject: [PATCH] --- yaml --- r: 197970 b: refs/heads/master c: 51ee049e771c14a29aaee8ecd6cbbe14db088f3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/super.c | 1 + trunk/include/linux/fs.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c9349b27e6a4..9633e0230f31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc9106247de92549e50abb0ba12d6b2fdbf0be55 +refs/heads/master: 51ee049e771c14a29aaee8ecd6cbbe14db088f3a diff --git a/trunk/fs/super.c b/trunk/fs/super.c index 89afca5055ab..69688b15f1fa 100644 --- a/trunk/fs/super.c +++ b/trunk/fs/super.c @@ -88,6 +88,7 @@ static struct super_block *alloc_super(struct file_system_type *type) s->s_count = 1; atomic_set(&s->s_active, 1); mutex_init(&s->s_vfs_rename_mutex); + lockdep_set_class(&s->s_vfs_rename_mutex, &type->s_vfs_rename_key); mutex_init(&s->s_dquot.dqio_mutex); mutex_init(&s->s_dquot.dqonoff_mutex); init_rwsem(&s->s_dquot.dqptr_sem); diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index f3e108314c93..9626c5fbb0e1 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1741,6 +1741,7 @@ struct file_system_type { struct lock_class_key s_lock_key; struct lock_class_key s_umount_key; + struct lock_class_key s_vfs_rename_key; struct lock_class_key i_lock_key; struct lock_class_key i_mutex_key;