summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-07-03 09:25:28 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-04 00:27:09 +0200
commit897c6ff9568bcb102ffc6b465ebe1def0cba829d (patch)
tree05e0ea4e39fd5b064bdcab351a468b1f3cb963d5 /fs
parent[PATCH] lockdep: annotate ->s_lock (diff)
downloadlinux-897c6ff9568bcb102ffc6b465ebe1def0cba829d.tar.xz
linux-897c6ff9568bcb102ffc6b465ebe1def0cba829d.zip
[PATCH] lockdep: annotate sb ->s_umount
The s_umount rwsem needs to be classified as per-superblock since it's perfectly legit to keep multiple of those recursively in the VFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/super.c b/fs/super.c
index 5a4fe8be462a..6d4e8174b6db 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -72,6 +72,7 @@ static struct super_block *alloc_super(struct file_system_type *type)
INIT_LIST_HEAD(&s->s_inodes);
init_rwsem(&s->s_umount);
mutex_init(&s->s_lock);
+ lockdep_set_class(&s->s_umount, &type->s_umount_key);
/*
* The locking rules for s_lock are up to the
* filesystem. For example ext3fs has different