From: Cedric Le Goater This patch fixes some spacing issues Signed-off-by: Cedric Le Goater Cc: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton --- arch/i386/kernel/sys_i386.c | 27 ++++++++++++++++----------- arch/m32r/kernel/sys_m32r.c | 2 +- arch/mips/kernel/linux32.c | 2 +- arch/mips/kernel/syscall.c | 25 +++++++++++++++---------- arch/parisc/hpux/sys_hpux.c | 25 +++++++++++++++---------- arch/sh/kernel/sys_sh.c | 2 +- arch/sh64/kernel/sys_sh64.c | 2 +- arch/sparc/kernel/sys_sunos.c | 15 ++++++++++----- arch/um/kernel/syscall_kern.c | 22 +++++++++++----------- arch/x86_64/ia32/sys_ia32.c | 23 ++++++++++++----------- fs/cifs/connect.c | 2 +- kernel/sys.c | 2 +- 12 files changed, 85 insertions(+), 64 deletions(-) diff -puN arch/i386/kernel/sys_i386.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/i386/kernel/sys_i386.c --- devel/arch/i386/kernel/sys_i386.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/i386/kernel/sys_i386.c 2006-06-09 15:22:39.000000000 -0700 @@ -210,7 +210,7 @@ asmlinkage int sys_uname(struct old_utsn if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); return err?-EFAULT:0; } @@ -226,16 +226,21 @@ asmlinkage int sys_olduname(struct oldol down_read(&uts_sem); - error = __copy_to_user(&name->sysname,&utsname()->sysname,__OLD_UTS_LEN); - error |= __put_user(0,name->sysname+__OLD_UTS_LEN); - error |= __copy_to_user(&name->nodename,&utsname()->nodename,__OLD_UTS_LEN); - error |= __put_user(0,name->nodename+__OLD_UTS_LEN); - error |= __copy_to_user(&name->release,&utsname()->release,__OLD_UTS_LEN); - error |= __put_user(0,name->release+__OLD_UTS_LEN); - error |= __copy_to_user(&name->version,&utsname()->version,__OLD_UTS_LEN); - error |= __put_user(0,name->version+__OLD_UTS_LEN); - error |= __copy_to_user(&name->machine,&utsname()->machine,__OLD_UTS_LEN); - error |= __put_user(0,name->machine+__OLD_UTS_LEN); + error = __copy_to_user(&name->sysname, &utsname()->sysname, + __OLD_UTS_LEN); + error |= __put_user(0, name->sysname + __OLD_UTS_LEN); + error |= __copy_to_user(&name->nodename, &utsname()->nodename, + __OLD_UTS_LEN); + error |= __put_user(0, name->nodename + __OLD_UTS_LEN); + error |= __copy_to_user(&name->release, &utsname()->release, + __OLD_UTS_LEN); + error |= __put_user(0, name->release + __OLD_UTS_LEN); + error |= __copy_to_user(&name->version, &utsname()->version, + __OLD_UTS_LEN); + error |= __put_user(0, name->version + __OLD_UTS_LEN); + error |= __copy_to_user(&name->machine, &utsname()->machine, + __OLD_UTS_LEN); + error |= __put_user(0, name->machine + __OLD_UTS_LEN); up_read(&uts_sem); diff -puN arch/m32r/kernel/sys_m32r.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/m32r/kernel/sys_m32r.c --- devel/arch/m32r/kernel/sys_m32r.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/sys_m32r.c 2006-06-09 15:22:39.000000000 -0700 @@ -206,7 +206,7 @@ asmlinkage int sys_uname(struct old_utsn if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); return err?-EFAULT:0; } diff -puN arch/mips/kernel/linux32.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/mips/kernel/linux32.c --- devel/arch/mips/kernel/linux32.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/mips/kernel/linux32.c 2006-06-09 15:22:39.000000000 -0700 @@ -1040,7 +1040,7 @@ asmlinkage long sys32_newuname(struct ne int ret = 0; down_read(&uts_sem); - if (copy_to_user(name,utsname(),sizeof *name)) + if (copy_to_user(name, utsname(), sizeof *name)) ret = -EFAULT; up_read(&uts_sem); diff -puN arch/mips/kernel/syscall.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/mips/kernel/syscall.c --- devel/arch/mips/kernel/syscall.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/mips/kernel/syscall.c 2006-06-09 15:22:39.000000000 -0700 @@ -249,16 +249,21 @@ asmlinkage int sys_olduname(struct oldol if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) return -EFAULT; - error = __copy_to_user(&name->sysname,&utsname()->sysname,__OLD_UTS_LEN); - error -= __put_user(0,name->sysname+__OLD_UTS_LEN); - error -= __copy_to_user(&name->nodename,&utsname()->nodename,__OLD_UTS_LEN); - error -= __put_user(0,name->nodename+__OLD_UTS_LEN); - error -= __copy_to_user(&name->release,&utsname()->release,__OLD_UTS_LEN); - error -= __put_user(0,name->release+__OLD_UTS_LEN); - error -= __copy_to_user(&name->version,&utsname()->version,__OLD_UTS_LEN); - error -= __put_user(0,name->version+__OLD_UTS_LEN); - error -= __copy_to_user(&name->machine,&utsname()->machine,__OLD_UTS_LEN); - error = __put_user(0,name->machine+__OLD_UTS_LEN); + error = __copy_to_user(&name->sysname, &utsname()->sysname, + __OLD_UTS_LEN); + error -= __put_user(0, name->sysname + __OLD_UTS_LEN); + error -= __copy_to_user(&name->nodename, &utsname()->nodename, + __OLD_UTS_LEN); + error -= __put_user(0, name->nodename + __OLD_UTS_LEN); + error -= __copy_to_user(&name->release, &utsname()->release, + __OLD_UTS_LEN); + error -= __put_user(0, name->release + __OLD_UTS_LEN); + error -= __copy_to_user(&name->version, &utsname()->version, + __OLD_UTS_LEN); + error -= __put_user(0, name->version + __OLD_UTS_LEN); + error -= __copy_to_user(&name->machine, &utsname()->machine, + __OLD_UTS_LEN); + error = __put_user(0, name->machine + __OLD_UTS_LEN); error = error ? -EFAULT : 0; return error; diff -puN arch/parisc/hpux/sys_hpux.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/parisc/hpux/sys_hpux.c --- devel/arch/parisc/hpux/sys_hpux.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/parisc/hpux/sys_hpux.c 2006-06-09 15:22:39.000000000 -0700 @@ -266,16 +266,21 @@ static int hpux_uname(struct hpux_utsnam down_read(&uts_sem); - error = __copy_to_user(&name->sysname,&utsname()->sysname,HPUX_UTSLEN-1); - error |= __put_user(0,name->sysname+HPUX_UTSLEN-1); - error |= __copy_to_user(&name->nodename,&utsname()->nodename,HPUX_UTSLEN-1); - error |= __put_user(0,name->nodename+HPUX_UTSLEN-1); - error |= __copy_to_user(&name->release,&utsname()->release,HPUX_UTSLEN-1); - error |= __put_user(0,name->release+HPUX_UTSLEN-1); - error |= __copy_to_user(&name->version,&utsname()->version,HPUX_UTSLEN-1); - error |= __put_user(0,name->version+HPUX_UTSLEN-1); - error |= __copy_to_user(&name->machine,&utsname()->machine,HPUX_UTSLEN-1); - error |= __put_user(0,name->machine+HPUX_UTSLEN-1); + error = __copy_to_user(&name->sysname, &utsname()->sysname, + HPUX_UTSLEN - 1); + error |= __put_user(0, name->sysname + HPUX_UTSLEN - 1); + error |= __copy_to_user(&name->nodename, &utsname()->nodename, + HPUX_UTSLEN - 1); + error |= __put_user(0, name->nodename + HPUX_UTSLEN - 1); + error |= __copy_to_user(&name->release, &utsname()->release, + HPUX_UTSLEN - 1); + error |= __put_user(0, name->release + HPUX_UTSLEN - 1); + error |= __copy_to_user(&name->version, &utsname()->version, + HPUX_UTSLEN - 1); + error |= __put_user(0, name->version + HPUX_UTSLEN - 1); + error |= __copy_to_user(&name->machine, &utsname()->machine, + HPUX_UTSLEN - 1); + error |= __put_user(0, name->machine + HPUX_UTSLEN - 1); up_read(&uts_sem); diff -puN arch/sh64/kernel/sys_sh64.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/sh64/kernel/sys_sh64.c --- devel/arch/sh64/kernel/sys_sh64.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/sh64/kernel/sys_sh64.c 2006-06-09 15:22:39.000000000 -0700 @@ -279,7 +279,7 @@ asmlinkage int sys_uname(struct old_utsn if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); return err?-EFAULT:0; } diff -puN arch/sh/kernel/sys_sh.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/sh/kernel/sys_sh.c --- devel/arch/sh/kernel/sys_sh.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/sh/kernel/sys_sh.c 2006-06-09 15:22:39.000000000 -0700 @@ -267,7 +267,7 @@ asmlinkage int sys_uname(struct old_utsn if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); return err?-EFAULT:0; } diff -puN arch/sparc/kernel/sys_sunos.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/sparc/kernel/sys_sunos.c --- devel/arch/sparc/kernel/sys_sunos.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/sparc/kernel/sys_sunos.c 2006-06-09 15:22:39.000000000 -0700 @@ -483,13 +483,18 @@ asmlinkage int sunos_uname(struct sunos_ { int ret; down_read(&uts_sem); - ret = copy_to_user(&name->sname[0], &utsname()->sysname[0], sizeof(name->sname) - 1); + ret = copy_to_user(&name->sname[0], &utsname()->sysname[0], + sizeof(name->sname) - 1); if (!ret) { - ret |= __copy_to_user(&name->nname[0], &utsname()->nodename[0], sizeof(name->nname) - 1); + ret |= __copy_to_user(&name->nname[0], &utsname()->nodename[0], + sizeof(name->nname) - 1); ret |= __put_user('\0', &name->nname[8]); - ret |= __copy_to_user(&name->rel[0], &utsname()->release[0], sizeof(name->rel) - 1); - ret |= __copy_to_user(&name->ver[0], &utsname()->version[0], sizeof(name->ver) - 1); - ret |= __copy_to_user(&name->mach[0], &utsname()->machine[0], sizeof(name->mach) - 1); + ret |= __copy_to_user(&name->rel[0], &utsname()->release[0], + sizeof(name->rel) - 1); + ret |= __copy_to_user(&name->ver[0], &utsname()->version[0], + sizeof(name->ver) - 1); + ret |= __copy_to_user(&name->mach[0], &utsname()->machine[0], + sizeof(name->mach) - 1); } up_read(&uts_sem); return ret ? -EFAULT : 0; diff -puN arch/um/kernel/syscall_kern.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/um/kernel/syscall_kern.c --- devel/arch/um/kernel/syscall_kern.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/um/kernel/syscall_kern.c 2006-06-09 15:22:39.000000000 -0700 @@ -110,7 +110,7 @@ long sys_uname(struct old_utsname __user if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); return err?-EFAULT:0; } @@ -126,21 +126,21 @@ long sys_olduname(struct oldold_utsname down_read(&uts_sem); - error = __copy_to_user(&name->sysname,&utsname()->sysname, + error = __copy_to_user(&name->sysname, &utsname()->sysname, __OLD_UTS_LEN); - error |= __put_user(0,name->sysname+__OLD_UTS_LEN); - error |= __copy_to_user(&name->nodename,&utsname()->nodename, + error |= __put_user(0, name->sysname + __OLD_UTS_LEN); + error |= __copy_to_user(&name->nodename, &utsname()->nodename, __OLD_UTS_LEN); - error |= __put_user(0,name->nodename+__OLD_UTS_LEN); - error |= __copy_to_user(&name->release,&utsname()->release, + error |= __put_user(0, name->nodename + __OLD_UTS_LEN); + error |= __copy_to_user(&name->release, &utsname()->release, __OLD_UTS_LEN); - error |= __put_user(0,name->release+__OLD_UTS_LEN); - error |= __copy_to_user(&name->version,&utsname()->version, + error |= __put_user(0, name->release + __OLD_UTS_LEN); + error |= __copy_to_user(&name->version, &utsname()->version, __OLD_UTS_LEN); - error |= __put_user(0,name->version+__OLD_UTS_LEN); - error |= __copy_to_user(&name->machine,&utsname()->machine, + error |= __put_user(0, name->version + __OLD_UTS_LEN); + error |= __copy_to_user(&name->machine, &utsname()->machine, __OLD_UTS_LEN); - error |= __put_user(0,name->machine+__OLD_UTS_LEN); + error |= __put_user(0, name->machine + __OLD_UTS_LEN); up_read(&uts_sem); diff -puN arch/x86_64/ia32/sys_ia32.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup arch/x86_64/ia32/sys_ia32.c --- devel/arch/x86_64/ia32/sys_ia32.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/arch/x86_64/ia32/sys_ia32.c 2006-06-09 15:22:39.000000000 -0700 @@ -796,25 +796,26 @@ asmlinkage long sys32_olduname(struct ol if (!name) return -EFAULT; - if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) + if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname))) return -EFAULT; down_read(&uts_sem); - error = __copy_to_user(&name->sysname,&utsname()->sysname,__OLD_UTS_LEN); - __put_user(0,name->sysname+__OLD_UTS_LEN); - __copy_to_user(&name->nodename,&utsname()->nodename,__OLD_UTS_LEN); - __put_user(0,name->nodename+__OLD_UTS_LEN); - __copy_to_user(&name->release,&utsname()->release,__OLD_UTS_LEN); - __put_user(0,name->release+__OLD_UTS_LEN); - __copy_to_user(&name->version,&utsname()->version,__OLD_UTS_LEN); - __put_user(0,name->version+__OLD_UTS_LEN); + error = __copy_to_user(&name->sysname, &utsname()->sysname, + __OLD_UTS_LEN); + __put_user(0, name->sysname + __OLD_UTS_LEN); + __copy_to_user(&name->nodename, &utsname()->nodename, __OLD_UTS_LEN); + __put_user(0, name->nodename + __OLD_UTS_LEN); + __copy_to_user(&name->release, &utsname()->release, __OLD_UTS_LEN); + __put_user(0, name->release + __OLD_UTS_LEN); + __copy_to_user(&name->version, &utsname()->version, __OLD_UTS_LEN); + __put_user(0, name->version + __OLD_UTS_LEN); { char *arch = "x86_64"; if (personality(current->personality) == PER_LINUX32) arch = "i686"; - __copy_to_user(&name->machine,arch,strlen(arch)+1); + __copy_to_user(&name->machine, arch, strlen(arch) + 1); } up_read(&uts_sem); @@ -830,7 +831,7 @@ long sys32_uname(struct old_utsname __us if (!name) return -EFAULT; down_read(&uts_sem); - err=copy_to_user(name, utsname(), sizeof (*name)); + err = copy_to_user(name, utsname(), sizeof (*name)); up_read(&uts_sem); if (personality(current->personality) == PER_LINUX32) err |= copy_to_user(&name->machine, "i686", 5); diff -puN fs/cifs/connect.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup fs/cifs/connect.c --- devel/fs/cifs/connect.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/fs/cifs/connect.c 2006-06-09 15:22:39.000000000 -0700 @@ -770,7 +770,7 @@ cifs_parse_mount_options(char *options, separator[1] = 0; memset(vol->source_rfc1001_name,0x20,15); - for(i=0;i < strnlen(utsname()->nodename,15);i++) { + for(i = 0; i < strnlen(utsname()->nodename, 15); i++) { /* does not have to be a perfect mapping since the field is informational, only used for servers that do not support port 445 and it can be overridden at mount time */ diff -puN kernel/sys.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup kernel/sys.c --- devel/kernel/sys.c~namespaces-utsname-switch-to-using-uts-namespaces-cleanup 2006-06-09 15:22:39.000000000 -0700 +++ devel-akpm/kernel/sys.c 2006-06-09 15:22:39.000000000 -0700 @@ -1676,7 +1676,7 @@ asmlinkage long sys_newuname(struct new_ int errno = 0; down_read(&uts_sem); - if (copy_to_user(name,utsname(),sizeof *name)) + if (copy_to_user(name, utsname(), sizeof *name)) errno = -EFAULT; up_read(&uts_sem); return errno; _