27 files changed, 63 insertions, 63 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 63e77e3944ce..9eb090582cf1 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -449,7 +449,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
 {
         int retval;
         struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
 
         retval = -EFAULT;
         if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -458,7 +458,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
         retval = PTR_ERR(devname);
         if (IS_ERR(devname))
                 goto out;
-        retval = do_mount(devname, dirname, "ext2", flags, NULL);
+        retval = do_mount(devname->name, dirname, "ext2", flags, NULL);
         putname(devname);
  out:
         return retval;
@@ -469,7 +469,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
 {
         int retval;
         struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
 
         retval = -EFAULT;
         if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -478,7 +478,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
         retval = PTR_ERR(devname);
         if (IS_ERR(devname))
                 goto out;
-        retval = do_mount(devname, dirname, "iso9660", flags, NULL);
+        retval = do_mount(devname->name, dirname, "iso9660", flags, NULL);
         putname(devname);
  out:
         return retval;
@@ -499,7 +499,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                 int, flag, void __user *, data)
 {
         int retval;
-        char *name;
+        struct filename *name;
 
         name = getname(path);
         retval = PTR_ERR(name);
@@ -507,13 +507,13 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                 goto out;
         switch (typenr) {
         case 1:
-                retval = osf_ufs_mount(name, data, flag);
+                retval = osf_ufs_mount(name->name, data, flag);
                 break;
         case 6:
-                retval = osf_cdfs_mount(name, data, flag);
+                retval = osf_cdfs_mount(name->name, data, flag);
                 break;
         case 9:
-                retval = osf_procfs_mount(name, data, flag);
+                retval = osf_procfs_mount(name->name, data, flag);
                 break;
         default:
                 retval = -EINVAL;
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index 905fcfb0ddd0..b120df37de35 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -50,13 +50,13 @@ asmlinkage long sys_execve(const char __user *filenamei,
                            struct pt_regs *regs)
 {
         long error;
-        char * filename;
+        struct filename *filename;
 
         filename = getname(filenamei);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
 out:
         return error;
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c
index 93f10e27dc79..e521087cb0c4 100644
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@ -56,14 +56,14 @@ asmlinkage int compat_sys_execve(const char __user *filenamei,
                                  struct pt_regs *regs)
 {
         int error;
-        char * filename;
+        struct filename *filename;
 
         filename = getname(filenamei);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = compat_do_execve(filename, compat_ptr(argv), compat_ptr(envp),
-                                 regs);
+        error = compat_do_execve(filename->name, compat_ptr(argv),
+                                        compat_ptr(envp), regs);
         putname(filename);
 out:
         return error;
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index 92c5af98a6f7..1bb0a8abd79b 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -388,14 +388,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
                           struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(ufilename);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename, uargv, uenvp, regs);
+        error = do_execve(filename->name, uargv, uenvp, regs);
         putname(filename);
 
 out:
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 62bcea7dcc6d..bb1cc721fcf7 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -213,14 +213,14 @@ asmlinkage int sys_execve(const char __user *name,
                           const char __user *const __user *envp)
 {
         int error;
-        char *filename;
+        struct filename *filename;
         struct pt_regs *regs = (struct pt_regs *)((&name) + 6);
 
         filename = getname(name);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 return error;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
         return error;
 }
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index bee8df43c201..15ac7150371f 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -212,14 +212,14 @@ asmlinkage int sys_execve(const char *fname,
                           struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(fname);
         error = PTR_ERR(filename);
 
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
  out:
         return error;
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 0570e8ce603d..4e9992246359 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -224,7 +224,7 @@ sys_execve(const char *fname,
            struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(fname);
         error = PTR_ERR(filename);
@@ -232,7 +232,7 @@ sys_execve(const char *fname,
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
  out:
         return error;
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index f153ed1a4c08..e8dc1393a13a 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -217,14 +217,14 @@ asmlinkage int sys_execve(const char *name,
                           int dummy, ...)
 {
         int error;
-        char * filename;
+        struct filename *filename;
         struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4);
 
         filename = getname(name);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 return error;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
         return error;
 }
diff --git a/arch/hexagon/kernel/syscall.c b/arch/hexagon/kernel/syscall.c
index 553cd60ee659..25a9bfe3445d 100644
--- a/arch/hexagon/kernel/syscall.c
+++ b/arch/hexagon/kernel/syscall.c
@@ -40,7 +40,7 @@ asmlinkage int sys_execve(char __user *ufilename,
                           const char __user *const __user *envp)
 {
         struct pt_regs *pregs = current_thread_info()->regs;
-        char *filename;
+        struct filename *filename;
         int retval;
 
         filename = getname(ufilename);
@@ -48,7 +48,7 @@ asmlinkage int sys_execve(char __user *ufilename,
         if (IS_ERR(filename))
                 return retval;
 
-        retval = do_execve(filename, argv, envp, pregs);
+        retval = do_execve(filename->name, argv, envp, pregs);
         putname(filename);
 
         return retval;
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index ee31fe9b310e..35e106f2ed13 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -614,14 +614,14 @@ sys_execve (const char __user *filename,
             const char __user *const __user *envp,
             struct pt_regs *regs)
 {
-        char *fname;
+        struct filename *fname;
         int error;
 
         fname = getname(filename);
         error = PTR_ERR(fname);
         if (IS_ERR(fname))
                 goto out;
-        error = do_execve(fname, argv, envp, regs);
+        error = do_execve(fname->name, argv, envp, regs);
         putname(fname);
 out:
         return error;
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 384e63f3a4c4..e7366276ef30 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -296,14 +296,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
                           unsigned long r6, struct pt_regs regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(ufilename);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename, uargv, uenvp, &regs);
+        error = do_execve(filename->name, uargv, uenvp, &regs);
         putname(filename);
 out:
         return error;
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
index e5b154f24f85..404c0f24bd41 100644
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
@@ -54,13 +54,13 @@ asmlinkage long microblaze_execve(const char __user *filenamei,
                                   struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(filenamei);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
 out:
         return error;
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 922a554cd108..3a21acedf882 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -83,13 +83,13 @@ out:
 asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs)
 {
         int error;
-        char * filename;
+        struct filename *filename;
 
         filename = getname(compat_ptr(regs.regs[4]));
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = compat_do_execve(filename, compat_ptr(regs.regs[5]),
+        error = compat_do_execve(filename->name, compat_ptr(regs.regs[5]),
                                  compat_ptr(regs.regs[6]), &regs);
         putname(filename);
 
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index b08220c82113..2bd561bc05ae 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -133,13 +133,13 @@ _sys_clone(nabi_no_regargs struct pt_regs regs)
 asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs)
 {
         int error;
-        char * filename;
+        struct filename *filename;
 
         filename = getname((const char __user *) (long)regs.regs[4]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *) (long)regs.regs[5],
                           (const char __user *const __user *) (long)regs.regs[6],
                           &regs);
diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index 55210f37d1a3..c35f3ab1a8d3 100644
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -271,7 +271,7 @@ asmlinkage long _sys_execve(const char __user *name,
                             struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(name);
         error = PTR_ERR(filename);
@@ -279,7 +279,7 @@ asmlinkage long _sys_execve(const char __user *name,
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
 
 out:
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 6785de7bd2a0..a0760b87fd4e 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -34,14 +34,14 @@
 int hpux_execve(struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname((const char __user *) regs->gr[26]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *) regs->gr[25],
                           (const char __user *const __user *) regs->gr[24],
                           regs);
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 8c6b6b6561f0..cbc37216bf90 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -342,13 +342,13 @@ unsigned long thread_saved_pc(struct task_struct *t)
 asmlinkage int sys_execve(struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname((const char __user *) regs->gr[26]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *) regs->gr[25],
                           (const char __user *const __user *) regs->gr[24],
                           regs);
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index dc9a62462323..bf5b93a885d3 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -60,14 +60,14 @@
 asmlinkage int sys32_execve(struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         DBG(("sys32_execve(%p) r26 = 0x%lx\n", regs, regs->gr[26]));
         filename = getname((const char __user *) regs->gr[26]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = compat_do_execve(filename, compat_ptr(regs->gr[25]),
+        error = compat_do_execve(filename->name, compat_ptr(regs->gr[25]),
                                  compat_ptr(regs->gr[24]), regs);
         putname(filename);
 out:
diff --git a/arch/score/kernel/sys_score.c b/arch/score/kernel/sys_score.c
index 21e867974066..d45cf00a3351 100644
--- a/arch/score/kernel/sys_score.c
+++ b/arch/score/kernel/sys_score.c
@@ -92,14 +92,14 @@ asmlinkage long
 score_execve(struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname((char __user*)regs->regs[4]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 return error;
 
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *)regs->regs[5],
                           (const char __user *const __user *)regs->regs[6],
                           regs);
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 59521e8a164d..ba7345f37bc9 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -298,14 +298,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
 {
         struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(ufilename);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename, uargv, uenvp, regs);
+        error = do_execve(filename->name, uargv, uenvp, regs);
         putname(filename);
 out:
         return error;
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 602545b12a86..98a709f0c3c4 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -491,14 +491,14 @@ asmlinkage int sys_execve(const char *ufilename, char **uargv,
                           struct pt_regs *pregs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname((char __user *)ufilename);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
 
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *)uargv,
                           (const char __user *const __user *)uenvp,
                           pregs);
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 14006d8aca28..487bffb36f5e 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -482,7 +482,7 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs)
 asmlinkage int sparc_execve(struct pt_regs *regs)
 {
         int error, base = 0;
-        char *filename;
+        struct filename *filename;
 
         /* Check for indirect call. */
         if(regs->u_regs[UREG_G1] == 0)
@@ -492,7 +492,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
         error = PTR_ERR(filename);
         if(IS_ERR(filename))
                 goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const  __user *)
                           regs->u_regs[base + UREG_I1],
                           (const char __user *const  __user *)
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index aff0c72fac09..fcaa59421126 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -722,7 +722,7 @@ EXPORT_SYMBOL(dump_fpu);
 asmlinkage int sparc_execve(struct pt_regs *regs)
 {
         int error, base = 0;
-        char *filename;
+        struct filename *filename;
 
         /* User register window flush is done by entry.S */
 
@@ -734,7 +734,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *)
                           regs->u_regs[base + UREG_I1],
                           (const char __user *const __user *)
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index d862499eb01c..c3239811a1b5 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -403,7 +403,7 @@ asmlinkage long compat_sys_rt_sigaction(int sig,
 asmlinkage long sparc32_execve(struct pt_regs *regs)
 {
         int error, base = 0;
-        char *filename;
+        struct filename *filename;
 
         /* User register window flush is done by entry.S */
 
@@ -416,7 +416,7 @@ asmlinkage long sparc32_execve(struct pt_regs *regs)
         if (IS_ERR(filename))
                 goto out;
 
-        error = compat_do_execve(filename,
+        error = compat_do_execve(filename->name,
                                  compat_ptr(regs->u_regs[base + UREG_I1]),
                                  compat_ptr(regs->u_regs[base + UREG_I2]), regs);
 
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 6be799150501..622560030a58 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -594,13 +594,13 @@ SYSCALL_DEFINE4(execve, const char __user *, path,
                 struct pt_regs *, regs)
 {
         long error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(path);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
         if (error == 0)
                 single_step_execve();
@@ -615,13 +615,13 @@ long compat_sys_execve(const char __user *path,
                        struct pt_regs *regs)
 {
         long error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname(path);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = compat_do_execve(filename, argv, envp, regs);
+        error = compat_do_execve(filename->name, argv, envp, regs);
         putname(filename);
         if (error == 0)
                 single_step_execve();
diff --git a/arch/unicore32/kernel/sys.c b/arch/unicore32/kernel/sys.c
index 5fd9af773e15..fabdee96110b 100644
--- a/arch/unicore32/kernel/sys.c
+++ b/arch/unicore32/kernel/sys.c
@@ -51,13 +51,13 @@ asmlinkage long __sys_execve(const char __user *filename,
                           struct pt_regs *regs)
 {
         int error;
-        char *fn;
+        struct filename *fn;
 
         fn = getname(filename);
         error = PTR_ERR(fn);
         if (IS_ERR(fn))
                 goto out;
-        error = do_execve(fn, argv, envp, regs);
+        error = do_execve(fn->name, argv, envp, regs);
         putname(fn);
 out:
         return error;
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index bc44311aa18c..bc020825cce5 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -328,13 +328,13 @@ long xtensa_execve(const char __user *name,
                    struct pt_regs *regs)
 {
         long error;
-        char * filename;
+        struct filename *filename;
 
         filename = getname(name);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
         putname(filename);
 out:
         return error;