aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r--fs/ocfs2/super.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index a8a0ca44f88f..56f0cb395820 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -630,8 +630,6 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
630 struct ocfs2_super *osb = OCFS2_SB(sb); 630 struct ocfs2_super *osb = OCFS2_SB(sb);
631 u32 tmp; 631 u32 tmp;
632 632
633 lock_kernel();
634
635 if (!ocfs2_parse_options(sb, data, &parsed_options, 1) || 633 if (!ocfs2_parse_options(sb, data, &parsed_options, 1) ||
636 !ocfs2_check_set_options(sb, &parsed_options)) { 634 !ocfs2_check_set_options(sb, &parsed_options)) {
637 ret = -EINVAL; 635 ret = -EINVAL;
@@ -739,7 +737,6 @@ unlock_osb:
739 MS_POSIXACL : 0); 737 MS_POSIXACL : 0);
740 } 738 }
741out: 739out:
742 unlock_kernel();
743 return ret; 740 return ret;
744} 741}
745 742
@@ -1696,13 +1693,9 @@ static void ocfs2_put_super(struct super_block *sb)
1696{ 1693{
1697 mlog_entry("(0x%p)\n", sb); 1694 mlog_entry("(0x%p)\n", sb);
1698 1695
1699 lock_kernel();
1700
1701 ocfs2_sync_blockdev(sb); 1696 ocfs2_sync_blockdev(sb);
1702 ocfs2_dismount_volume(sb, 0); 1697 ocfs2_dismount_volume(sb, 0);
1703 1698
1704 unlock_kernel();
1705
1706 mlog_exit_void(); 1699 mlog_exit_void();
1707} 1700}
1708 1701