Push BKL into do_mount()
Al Viro [Fri, 8 May 2009 17:31:17 +0000 (13:31 -0400)]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/alpha/kernel/osf_sys.c
fs/compat.c
fs/namespace.c

index 42ee059..9a3334a 100644 (file)
@@ -371,8 +371,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
        int retval = -EINVAL;
        char *name;
 
-       lock_kernel();
-
        name = getname(path);
        retval = PTR_ERR(name);
        if (IS_ERR(name))
@@ -392,7 +390,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
        }
        putname(name);
  out:
-       unlock_kernel();
        return retval;
 }
 
index bb2a9b2..6aefb77 100644 (file)
@@ -812,10 +812,8 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
                }
        }
 
-       lock_kernel();
        retval = do_mount((char*)dev_page, dir_page, (char*)type_page,
                        flags, (void*)data_page);
-       unlock_kernel();
 
  out4:
        free_page(data_page);
index 7e537f0..4740f7b 100644 (file)
@@ -1921,6 +1921,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
        if (retval)
                goto dput_out;
 
+       lock_kernel();
        if (flags & MS_REMOUNT)
                retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
                                    data_page);
@@ -1933,6 +1934,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
        else
                retval = do_new_mount(&path, type_page, flags, mnt_flags,
                                      dev_name, data_page);
+       unlock_kernel();
 dput_out:
        path_put(&path);
        return retval;
@@ -2046,10 +2048,8 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
        if (retval < 0)
                goto out3;
 
-       lock_kernel();
        retval = do_mount((char *)dev_page, dir_page, (char *)type_page,
                          flags, (void *)data_page);
-       unlock_kernel();
        free_page(data_page);
 
 out3: