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>
This commit is contained in:
parent
d646cf82e9
commit
77b54a46a8
@ -411,9 +411,6 @@ static void ext3_put_super (struct super_block * sb)
|
|||||||
int i, err;
|
int i, err;
|
||||||
|
|
||||||
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
|
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
|
|
||||||
ext3_xattr_put_super(sb);
|
ext3_xattr_put_super(sb);
|
||||||
err = journal_destroy(sbi->s_journal);
|
err = journal_destroy(sbi->s_journal);
|
||||||
sbi->s_journal = NULL;
|
sbi->s_journal = NULL;
|
||||||
@ -462,8 +459,6 @@ static void ext3_put_super (struct super_block * sb)
|
|||||||
sb->s_fs_info = NULL;
|
sb->s_fs_info = NULL;
|
||||||
kfree(sbi->s_blockgroup_lock);
|
kfree(sbi->s_blockgroup_lock);
|
||||||
kfree(sbi);
|
kfree(sbi);
|
||||||
|
|
||||||
unlock_kernel();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct kmem_cache *ext3_inode_cachep;
|
static struct kmem_cache *ext3_inode_cachep;
|
||||||
@ -2534,8 +2529,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
|
|||||||
int i;
|
int i;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
|
|
||||||
/* Store the original options */
|
/* Store the original options */
|
||||||
lock_super(sb);
|
lock_super(sb);
|
||||||
old_sb_flags = sb->s_flags;
|
old_sb_flags = sb->s_flags;
|
||||||
@ -2644,7 +2637,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
|
|||||||
kfree(old_opts.s_qf_names[i]);
|
kfree(old_opts.s_qf_names[i]);
|
||||||
#endif
|
#endif
|
||||||
unlock_super(sb);
|
unlock_super(sb);
|
||||||
unlock_kernel();
|
|
||||||
|
|
||||||
if (enable_quota)
|
if (enable_quota)
|
||||||
dquot_resume(sb, -1);
|
dquot_resume(sb, -1);
|
||||||
@ -2665,7 +2657,6 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
unlock_super(sb);
|
unlock_super(sb);
|
||||||
unlock_kernel();
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user