diff options
author | Jan Blunck <jblunck@infradead.org> | 2010-02-24 07:25:30 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-04 15:10:37 -0400 |
commit | 77b54a46a83232d172d55013c3af838190615260 (patch) | |
tree | 288a399af0d549df198e3773087bf034a7281383 /fs/ext3 | |
parent | d646cf82e9b6a58ba2d748e66e5fc7223830c68c (diff) |
BKL: Remove BKL from ext3_put_super() and ext3_remount()
The BKL lock is protecting the remounting against a potential call to
ext3_put_super(). This could not happen, since this is protected by the
s_umount rw semaphore of struct super_block.
Therefore I think the BKL is protecting nothing here.
Signed-off-by: Jan Blunck <jblunck@infradead.org>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/ext3')
-rw-r--r-- | fs/ext3/super.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index edde63fdb9a1..2e20bd771337 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -411,9 +411,6 @@ static void ext3_put_super (struct super_block * sb) | |||
411 | int i, err; | 411 | int i, err; |
412 | 412 | ||
413 | dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); | 413 | dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); |
414 | |||
415 | lock_kernel(); | ||
416 | |||
417 | ext3_xattr_put_super(sb); | 414 | ext3_xattr_put_super(sb); |
418 | err = journal_destroy(sbi->s_journal); | 415 | err = journal_destroy(sbi->s_journal); |
419 | sbi->s_journal = NULL; | 416 | sbi->s_journal = NULL; |
@@ -462,8 +459,6 @@ static void ext3_put_super (struct super_block * sb) | |||
462 | sb->s_fs_info = NULL; | 459 | sb->s_fs_info = NULL; |
463 | kfree(sbi->s_blockgroup_lock); | 460 | kfree(sbi->s_blockgroup_lock); |
464 | kfree(sbi); | 461 | kfree(sbi); |
465 | |||
466 | unlock_kernel(); | ||
467 | } | 462 | } |
468 | 463 | ||
469 | static struct kmem_cache *ext3_inode_cachep; | 464 | static struct kmem_cache *ext3_inode_cachep; |
@@ -2534,8 +2529,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) | |||
2534 | int i; | 2529 | int i; |
2535 | #endif | 2530 | #endif |
2536 | 2531 | ||
2537 | lock_kernel(); | ||
2538 | |||
2539 | /* Store the original options */ | 2532 | /* Store the original options */ |
2540 | lock_super(sb); | 2533 | lock_super(sb); |
2541 | old_sb_flags = sb->s_flags; | 2534 | old_sb_flags = sb->s_flags; |
@@ -2644,7 +2637,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) | |||
2644 | kfree(old_opts.s_qf_names[i]); | 2637 | kfree(old_opts.s_qf_names[i]); |
2645 | #endif | 2638 | #endif |
2646 | unlock_super(sb); | 2639 | unlock_super(sb); |
2647 | unlock_kernel(); | ||
2648 | 2640 | ||
2649 | if (enable_quota) | 2641 | if (enable_quota) |
2650 | dquot_resume(sb, -1); | 2642 | dquot_resume(sb, -1); |
@@ -2665,7 +2657,6 @@ restore_opts: | |||
2665 | } | 2657 | } |
2666 | #endif | 2658 | #endif |
2667 | unlock_super(sb); | 2659 | unlock_super(sb); |
2668 | unlock_kernel(); | ||
2669 | return err; | 2660 | return err; |
2670 | } | 2661 | } |
2671 | 2662 | ||