diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2008-07-04 12:59:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 13:40:05 -0400 |
commit | c4a2d7fbec3029c8891a3ad5fceec2992096a3b7 (patch) | |
tree | 73d1580628737c54c9d4fed86278e9edc4dab4d2 /fs | |
parent | 10dd08dc04c881dcc9f7f19e2a3ad8e0778e4db5 (diff) |
ecryptfs: remove unnecessary mux from ecryptfs_init_ecryptfs_miscdev()
The misc_mtx should provide all the protection required to keep the daemon
hash table sane during miscdev registration. Since this mutex is causing
gratuitous lockdep warnings, this patch removes it.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/miscdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 50c994a249a5..09a4522f65e6 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
@@ -575,13 +575,11 @@ int ecryptfs_init_ecryptfs_miscdev(void) | |||
575 | int rc; | 575 | int rc; |
576 | 576 | ||
577 | atomic_set(&ecryptfs_num_miscdev_opens, 0); | 577 | atomic_set(&ecryptfs_num_miscdev_opens, 0); |
578 | mutex_lock(&ecryptfs_daemon_hash_mux); | ||
579 | rc = misc_register(&ecryptfs_miscdev); | 578 | rc = misc_register(&ecryptfs_miscdev); |
580 | if (rc) | 579 | if (rc) |
581 | printk(KERN_ERR "%s: Failed to register miscellaneous device " | 580 | printk(KERN_ERR "%s: Failed to register miscellaneous device " |
582 | "for communications with userspace daemons; rc = [%d]\n", | 581 | "for communications with userspace daemons; rc = [%d]\n", |
583 | __func__, rc); | 582 | __func__, rc); |
584 | mutex_unlock(&ecryptfs_daemon_hash_mux); | ||
585 | return rc; | 583 | return rc; |
586 | } | 584 | } |
587 | 585 | ||