From 5a5369ec9b7834f087a1edf70cf40437f02c4753 Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Sat, 6 Oct 2012 12:39:20 +0200 Subject: [PATCH] --- yaml --- r: 333696 b: refs/heads/master c: 67e2c19a3bcd32172c1d67294a1d6bb4bc60ca77 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext3/super.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5fdc342664f8..dd2ffb735b71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f7754c8891af65124dce63adb59a33198f0bf35 +refs/heads/master: 67e2c19a3bcd32172c1d67294a1d6bb4bc60ca77 diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index 17ae5c83d234..29e79713c7eb 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -2578,11 +2578,9 @@ static int ext3_freeze(struct super_block *sb) static int ext3_unfreeze(struct super_block *sb) { if (!(sb->s_flags & MS_RDONLY)) { - lock_super(sb); /* Reser the needs_recovery flag before the fs is unlocked. */ EXT3_SET_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); ext3_commit_super(sb, EXT3_SB(sb)->s_es, 1); - unlock_super(sb); journal_unlock_updates(EXT3_SB(sb)->s_journal); } return 0; @@ -2602,7 +2600,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) #endif /* Store the original options */ - lock_super(sb); old_sb_flags = sb->s_flags; old_opts.s_mount_opt = sbi->s_mount_opt; old_opts.s_resuid = sbi->s_resuid; @@ -2708,8 +2705,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) old_opts.s_qf_names[i] != sbi->s_qf_names[i]) kfree(old_opts.s_qf_names[i]); #endif - unlock_super(sb); - if (enable_quota) dquot_resume(sb, -1); return 0; @@ -2728,7 +2723,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) sbi->s_qf_names[i] = old_opts.s_qf_names[i]; } #endif - unlock_super(sb); return err; }