aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index a367dd044280..377768009106 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
469static struct kmem_cache *ext3_inode_cachep; 464static struct kmem_cache *ext3_inode_cachep;
@@ -1627,8 +1622,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1627 sbi->s_resgid = EXT3_DEF_RESGID; 1622 sbi->s_resgid = EXT3_DEF_RESGID;
1628 sbi->s_sb_block = sb_block; 1623 sbi->s_sb_block = sb_block;
1629 1624
1630 unlock_kernel();
1631
1632 blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE); 1625 blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
1633 if (!blocksize) { 1626 if (!blocksize) {
1634 ext3_msg(sb, KERN_ERR, "error: unable to set blocksize"); 1627 ext3_msg(sb, KERN_ERR, "error: unable to set blocksize");
@@ -2025,7 +2018,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
2025 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered": 2018 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
2026 "writeback"); 2019 "writeback");
2027 2020
2028 lock_kernel();
2029 return 0; 2021 return 0;
2030 2022
2031cantfind_ext3: 2023cantfind_ext3:
@@ -2055,7 +2047,6 @@ out_fail:
2055 sb->s_fs_info = NULL; 2047 sb->s_fs_info = NULL;
2056 kfree(sbi->s_blockgroup_lock); 2048 kfree(sbi->s_blockgroup_lock);
2057 kfree(sbi); 2049 kfree(sbi);
2058 lock_kernel();
2059 return ret; 2050 return ret;
2060} 2051}
2061 2052
@@ -2538,8 +2529,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
2538 int i; 2529 int i;
2539#endif 2530#endif
2540 2531
2541 lock_kernel();
2542
2543 /* Store the original options */ 2532 /* Store the original options */
2544 lock_super(sb); 2533 lock_super(sb);
2545 old_sb_flags = sb->s_flags; 2534 old_sb_flags = sb->s_flags;
@@ -2648,7 +2637,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
2648 kfree(old_opts.s_qf_names[i]); 2637 kfree(old_opts.s_qf_names[i]);
2649#endif 2638#endif
2650 unlock_super(sb); 2639 unlock_super(sb);
2651 unlock_kernel();
2652 2640
2653 if (enable_quota) 2641 if (enable_quota)
2654 dquot_resume(sb, -1); 2642 dquot_resume(sb, -1);
@@ -2669,7 +2657,6 @@ restore_opts:
2669 } 2657 }
2670#endif 2658#endif
2671 unlock_super(sb); 2659 unlock_super(sb);
2672 unlock_kernel();
2673 return err; 2660 return err;
2674} 2661}
2675 2662