diff options
Diffstat (limited to 'fs/ext3/super.c')
| -rw-r--r-- | fs/ext3/super.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 17ae5c83d234..29e79713c7eb 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -2578,11 +2578,9 @@ out: | |||
| 2578 | static int ext3_unfreeze(struct super_block *sb) | 2578 | static int ext3_unfreeze(struct super_block *sb) |
| 2579 | { | 2579 | { |
| 2580 | if (!(sb->s_flags & MS_RDONLY)) { | 2580 | if (!(sb->s_flags & MS_RDONLY)) { |
| 2581 | lock_super(sb); | ||
| 2582 | /* Reser the needs_recovery flag before the fs is unlocked. */ | 2581 | /* Reser the needs_recovery flag before the fs is unlocked. */ |
| 2583 | EXT3_SET_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); | 2582 | EXT3_SET_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); |
| 2584 | ext3_commit_super(sb, EXT3_SB(sb)->s_es, 1); | 2583 | ext3_commit_super(sb, EXT3_SB(sb)->s_es, 1); |
| 2585 | unlock_super(sb); | ||
| 2586 | journal_unlock_updates(EXT3_SB(sb)->s_journal); | 2584 | journal_unlock_updates(EXT3_SB(sb)->s_journal); |
| 2587 | } | 2585 | } |
| 2588 | return 0; | 2586 | return 0; |
| @@ -2602,7 +2600,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) | |||
| 2602 | #endif | 2600 | #endif |
| 2603 | 2601 | ||
| 2604 | /* Store the original options */ | 2602 | /* Store the original options */ |
| 2605 | lock_super(sb); | ||
| 2606 | old_sb_flags = sb->s_flags; | 2603 | old_sb_flags = sb->s_flags; |
| 2607 | old_opts.s_mount_opt = sbi->s_mount_opt; | 2604 | old_opts.s_mount_opt = sbi->s_mount_opt; |
| 2608 | old_opts.s_resuid = sbi->s_resuid; | 2605 | old_opts.s_resuid = sbi->s_resuid; |
| @@ -2708,8 +2705,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) | |||
| 2708 | old_opts.s_qf_names[i] != sbi->s_qf_names[i]) | 2705 | old_opts.s_qf_names[i] != sbi->s_qf_names[i]) |
| 2709 | kfree(old_opts.s_qf_names[i]); | 2706 | kfree(old_opts.s_qf_names[i]); |
| 2710 | #endif | 2707 | #endif |
| 2711 | unlock_super(sb); | ||
| 2712 | |||
| 2713 | if (enable_quota) | 2708 | if (enable_quota) |
| 2714 | dquot_resume(sb, -1); | 2709 | dquot_resume(sb, -1); |
| 2715 | return 0; | 2710 | return 0; |
| @@ -2728,7 +2723,6 @@ restore_opts: | |||
| 2728 | sbi->s_qf_names[i] = old_opts.s_qf_names[i]; | 2723 | sbi->s_qf_names[i] = old_opts.s_qf_names[i]; |
| 2729 | } | 2724 | } |
| 2730 | #endif | 2725 | #endif |
| 2731 | unlock_super(sb); | ||
| 2732 | return err; | 2726 | return err; |
| 2733 | } | 2727 | } |
| 2734 | 2728 | ||
