diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-09-16 09:35:54 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-04 15:10:48 -0400 |
commit | 18dfe89d7c394b56e20e06dde8b7a80ff96cf02c (patch) | |
tree | bcf8dee4faffd32cc5cfec2febe40f145d0c23aa /fs/ecryptfs/main.c | |
parent | 77f2fe036cd51300c80d1aca76bcf23a09977f13 (diff) |
BKL: Remove BKL from ecryptfs
The BKL is only used in fill_super, which is protected by the superblocks
s_umount rw_semaphorei, and in fasync, which does not do anything that
could require the BKL. Therefore it is safe to remove the BKL entirely.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dustin Kirkland <kirkland@canonical.com>
Cc: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Cc: ecryptfs-devel@lists.launchpad.net
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r-- | fs/ecryptfs/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index c4af92fa12c3..cbd4e18adb20 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/parser.h> | 36 | #include <linux/parser.h> |
37 | #include <linux/fs_stack.h> | 37 | #include <linux/fs_stack.h> |
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | #include <linux/smp_lock.h> /* For lock_kernel() */ | ||
40 | #include "ecryptfs_kernel.h" | 39 | #include "ecryptfs_kernel.h" |
41 | 40 | ||
42 | /** | 41 | /** |
@@ -551,7 +550,6 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags, | |||
551 | const char *err = "Getting sb failed"; | 550 | const char *err = "Getting sb failed"; |
552 | int rc; | 551 | int rc; |
553 | 552 | ||
554 | lock_kernel(); | ||
555 | sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL); | 553 | sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL); |
556 | if (!sbi) { | 554 | if (!sbi) { |
557 | rc = -ENOMEM; | 555 | rc = -ENOMEM; |
@@ -610,7 +608,6 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags, | |||
610 | goto out; | 608 | goto out; |
611 | } | 609 | } |
612 | simple_set_mnt(mnt, s); | 610 | simple_set_mnt(mnt, s); |
613 | unlock_kernel(); | ||
614 | return 0; | 611 | return 0; |
615 | 612 | ||
616 | out: | 613 | out: |
@@ -619,7 +616,6 @@ out: | |||
619 | kmem_cache_free(ecryptfs_sb_info_cache, sbi); | 616 | kmem_cache_free(ecryptfs_sb_info_cache, sbi); |
620 | } | 617 | } |
621 | printk(KERN_ERR "%s; rc = [%d]\n", err, rc); | 618 | printk(KERN_ERR "%s; rc = [%d]\n", err, rc); |
622 | unlock_kernel(); | ||
623 | return rc; | 619 | return rc; |
624 | } | 620 | } |
625 | 621 | ||