isofs: cleanup mount option processing

[firefly-linux-kernel-4.4.55.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index a64f362087975e47eafda45a04a24e6b6a582c89..d40d53a22fb595d3489e1273ac6efb26481b39e1 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -420,10 +420,8 @@ restart:
                        spin_unlock(&sb_lock);
 
                        down_read(&sb->s_umount);
-                       lock_super(sb);
                        if (sb->s_root && sb->s_dirt)
                                sb->s_op->write_super(sb);
-                       unlock_super(sb);
                        up_read(&sb->s_umount);
 
                        spin_lock(&sb_lock);
@@ -542,33 +540,25 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
        shrink_dcache_sb(sb);
        sync_filesystem(sb);
 
-       lock_kernel();
        /* If we are remounting RDONLY and current sb is read/write,
           make sure there are no rw files opened */
        if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
                if (force)
                        mark_files_ro(sb);
-               else if (!fs_may_remount_ro(sb)) {
-                       unlock_kernel();
+               else if (!fs_may_remount_ro(sb))
                        return -EBUSY;
-               }
                retval = vfs_dq_off(sb, 1);
-               if (retval < 0 && retval != -ENOSYS) {
-                       unlock_kernel();
+               if (retval < 0 && retval != -ENOSYS)
                        return -EBUSY;
-               }
        }
        remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
 
        if (sb->s_op->remount_fs) {
                retval = sb->s_op->remount_fs(sb, &flags, data);
-               if (retval) {
-                       unlock_kernel();
+               if (retval)
                        return retval;
-               }
        }
        sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
-       unlock_kernel();
        if (remount_rw)
                vfs_dq_quota_on_remount(sb);
        return 0;