Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

diff --git a/fs/super.c b/fs/super.c
index cb19fffc7681f9d5b96bfa22c8050df0728bcaca..83b47416d0069bba99e738212a0d673d2b98564e 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -304,12 +304,11 @@ void generic_shutdown_super(struct super_block *sb)
        if (sb->s_root) {
                shrink_dcache_for_umount(sb);
                sync_filesystem(sb);
-               lock_super(sb);
+               get_fs_excl();
                sb->s_flags &= ~MS_ACTIVE;
 
                /* bad name - it should be evict_inodes() */
                invalidate_inodes(sb);
-               lock_kernel();
 
                if (sop->put_super)
                        sop->put_super(sb);
@@ -320,9 +319,7 @@ void generic_shutdown_super(struct super_block *sb)
                           "Self-destruct in 5 seconds.  Have a nice day...\n",
                           sb->s_id);
                }
-
-               unlock_kernel();
-               unlock_super(sb);
+               put_fs_excl();
        }
        spin_lock(&sb_lock);
        /* should be initialized for __put_super_and_need_restart() */
@@ -423,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);
@@ -550,20 +545,24 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
        if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
                if (force)
                        mark_files_ro(sb);
-               else if (!fs_may_remount_ro(sb))
+               else if (!fs_may_remount_ro(sb)) {
+                       unlock_kernel();
                        return -EBUSY;
+               }
                retval = vfs_dq_off(sb, 1);
-               if (retval < 0 && retval != -ENOSYS)
+               if (retval < 0 && retval != -ENOSYS) {
+                       unlock_kernel();
                        return -EBUSY;
+               }
        }
        remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
 
        if (sb->s_op->remount_fs) {
-               lock_super(sb);
                retval = sb->s_op->remount_fs(sb, &flags, data);
-               unlock_super(sb);
-               if (retval)
+               if (retval) {
+                       unlock_kernel();
                        return retval;
+               }
        }
        sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
        if (remount_rw)
@@ -579,18 +578,17 @@ static void do_emergency_remount(struct work_struct *work)
        list_for_each_entry(sb, &super_blocks, s_list) {
                sb->s_count++;
                spin_unlock(&sb_lock);
-               down_read(&sb->s_umount);
+               down_write(&sb->s_umount);
                if (sb->s_root && sb->s_bdev && !(sb->s_flags & MS_RDONLY)) {
                        /*
                         * ->remount_fs needs lock_kernel().
                         *
                         * What lock protects sb->s_flags??
                         */
-                       lock_kernel();
                        do_remount_sb(sb, MS_RDONLY, NULL, 1);
-                       unlock_kernel();
                }
-               drop_super(sb);
+               up_write(&sb->s_umount);
+               put_super(sb);
                spin_lock(&sb_lock);
        }
        spin_unlock(&sb_lock);