uml: style fixes pass 3

Formatting changes in the files which have been changed in the course
of folding foo_skas functions into their callers.  These include:
	copyright updates
	header file trimming
	style fixes
	adding severity to printks

These changes should be entirely non-functional.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 74 insertions, 62 deletions

diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c
index e36541e5ec00..106fa8641553 100644
--- a/arch/um/os-Linux/umid.c
+++ b/arch/um/os-Linux/umid.c
@@ -1,14 +1,19 @@
+/*
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
+#include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
-#include <dirent.h>
-#include <sys/fcntl.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include "init.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "user.h"
 
@@ -27,13 +32,13 @@ static int __init make_uml_dir(void)
         char dir[512] = { '\0' };
         int len, err;
 
-        if(*uml_dir == '~'){
+        if (*uml_dir == '~') {
                 char *home = getenv("HOME");
 
                 err = -ENOENT;
-                if(home == NULL){
-                        printk("make_uml_dir : no value in environment for "
-                               "$HOME\n");
+                if (home == NULL) {
+                        printk(UM_KERN_ERR "make_uml_dir : no value in "
+                               "environment for $HOME\n");
                         goto err;
                 }
                 strlcpy(dir, home, sizeof(dir));
@@ -52,7 +57,7 @@ static int __init make_uml_dir(void)
         }
         strcpy(uml_dir, dir);
 
-        if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
+        if ((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)) {
                 printf("Failed to mkdir '%s': %s\n", uml_dir, strerror(errno));
                 err = -errno;
                 goto err_free;
@@ -69,8 +74,8 @@ err:
 /*
  * Unlinks the files contained in @dir and then removes @dir.
  * Doesn't handle directory trees, so it's not like rm -rf, but almost such. We
- * ignore ENOENT errors for anything (they happen, strangely enough - possibly due
- * to races between multiple dying UML threads).
+ * ignore ENOENT errors for anything (they happen, strangely enough - possibly
+ * due to races between multiple dying UML threads).
  */
 static int remove_files_and_dir(char *dir)
 {
@@ -115,7 +120,8 @@ out:
         return ret;
 }
 
-/* This says that there isn't already a user of the specified directory even if
+/*
+ * This says that there isn't already a user of the specified directory even if
  * there are errors during the checking.  This is because if these errors
  * happen, the directory is unusable by the pre-existing UML, so we might as
  * well take it over.  This could happen either by
@@ -133,44 +139,45 @@ static inline int is_umdir_used(char *dir)
         int dead, fd, p, n, err;
 
         n = snprintf(file, sizeof(file), "%s/pid", dir);
-        if(n >= sizeof(file)){
-                printk("is_umdir_used - pid filename too long\n");
+        if (n >= sizeof(file)) {
+                printk(UM_KERN_ERR "is_umdir_used - pid filename too long\n");
                 err = -E2BIG;
                 goto out;
         }
 
         dead = 0;
         fd = open(file, O_RDONLY);
-        if(fd < 0) {
+        if (fd < 0) {
                 fd = -errno;
-                if(fd != -ENOENT){
-                        printk("is_umdir_used : couldn't open pid file '%s', "
-                               "err = %d\n", file, -fd);
+                if (fd != -ENOENT) {
+                        printk(UM_KERN_ERR "is_umdir_used : couldn't open pid "
+                               "file '%s', err = %d\n", file, -fd);
                 }
                 goto out;
         }
 
         err = 0;
         n = read(fd, pid, sizeof(pid));
-        if(n < 0){
-                printk("is_umdir_used : couldn't read pid file '%s', "
-                       "err = %d\n", file, errno);
+        if (n < 0) {
+                printk(UM_KERN_ERR "is_umdir_used : couldn't read pid file "
+                       "'%s', err = %d\n", file, errno);
                 goto out_close;
-        } else if(n == 0){
-                printk("is_umdir_used : couldn't read pid file '%s', "
-                       "0-byte read\n", file);
+        } else if (n == 0) {
+                printk(UM_KERN_ERR "is_umdir_used : couldn't read pid file "
+                       "'%s', 0-byte read\n", file);
                 goto out_close;
         }
 
         p = strtoul(pid, &end, 0);
-        if(end == pid){
-                printk("is_umdir_used : couldn't parse pid file '%s', "
-                       "errno = %d\n", file, errno);
+        if (end == pid) {
+                printk(UM_KERN_ERR "is_umdir_used : couldn't parse pid file "
+                       "'%s', errno = %d\n", file, errno);
                 goto out_close;
         }
 
-        if((kill(p, 0) == 0) || (errno != ESRCH)){
-                printk("umid \"%s\" is already in use by pid %d\n", umid, p);
+        if ((kill(p, 0) == 0) || (errno != ESRCH)) {
+                printk(UM_KERN_ERR "umid \"%s\" is already in use by pid %d\n",
+                       umid, p);
                 return 1;
         }
 
@@ -194,8 +201,8 @@ static int umdir_take_if_dead(char *dir)
 
         ret = remove_files_and_dir(dir);
         if (ret) {
-                printk("is_umdir_used - remove_files_and_dir failed with "
-                       "err = %d\n", ret);
+                printk(UM_KERN_ERR "is_umdir_used - remove_files_and_dir "
+                       "failed with err = %d\n", ret);
         }
         return ret;
 }
@@ -206,27 +213,28 @@ static void __init create_pid_file(void)
         char pid[sizeof("nnnnn\0")];
         int fd, n;
 
-        if(umid_file_name("pid", file, sizeof(file)))
+        if (umid_file_name("pid", file, sizeof(file)))
                 return;
 
         fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644);
-        if(fd < 0){
-                printk("Open of machine pid file \"%s\" failed: %s\n",
-                       file, strerror(errno));
+        if (fd < 0) {
+                printk(UM_KERN_ERR "Open of machine pid file \"%s\" failed: "
+                       "%s\n", file, strerror(errno));
                 return;
         }
 
         snprintf(pid, sizeof(pid), "%d\n", getpid());
         n = write(fd, pid, strlen(pid));
-        if(n != strlen(pid))
-                printk("Write of pid file failed - err = %d\n", errno);
+        if (n != strlen(pid))
+                printk(UM_KERN_ERR "Write of pid file failed - err = %d\n",
+                       errno);
 
         close(fd);
 }
 
 int __init set_umid(char *name)
 {
-        if(strlen(name) > UMID_LEN - 1)
+        if (strlen(name) > UMID_LEN - 1)
                 return -E2BIG;
 
         strlcpy(umid, name, sizeof(umid));
@@ -242,18 +250,18 @@ int __init make_umid(void)
         int fd, err;
         char tmp[256];
 
-        if(umid_setup)
+        if (umid_setup)
                 return 0;
 
         make_uml_dir();
 
-        if(*umid == '\0'){
+        if (*umid == '\0') {
                 strlcpy(tmp, uml_dir, sizeof(tmp));
                 strlcat(tmp, "XXXXXX", sizeof(tmp));
                 fd = mkstemp(tmp);
-                if(fd < 0){
-                        printk("make_umid - mkstemp(%s) failed: %s\n",
-                               tmp, strerror(errno));
+                if (fd < 0) {
+                        printk(UM_KERN_ERR "make_umid - mkstemp(%s) failed: "
+                               "%s\n", tmp, strerror(errno));
                         err = -errno;
                         goto err;
                 }
@@ -262,11 +270,12 @@ int __init make_umid(void)
 
                 set_umid(&tmp[strlen(uml_dir)]);
 
-                /* There's a nice tiny little race between this unlink and
+                /*
+                 * There's a nice tiny little race between this unlink and
                  * the mkdir below.  It'd be nice if there were a mkstemp
                  * for directories.
                  */
-                if(unlink(tmp)){
+                if (unlink(tmp)) {
                         err = -errno;
                         goto err;
                 }
@@ -274,9 +283,9 @@ int __init make_umid(void)
 
         snprintf(tmp, sizeof(tmp), "%s%s", uml_dir, umid);
         err = mkdir(tmp, 0777);
-        if(err < 0){
+        if (err < 0) {
                 err = -errno;
-                if(err != -EEXIST)
+                if (err != -EEXIST)
                         goto err;
 
                 if (umdir_take_if_dead(tmp) < 0)
@@ -284,9 +293,10 @@ int __init make_umid(void)
 
                 err = mkdir(tmp, 0777);
         }
-        if(err){
+        if (err) {
                 err = -errno;
-                printk("Failed to create '%s' - err = %d\n", umid, -errno);
+                printk(UM_KERN_ERR "Failed to create '%s' - err = %d\n", umid,
+                       errno);
                 goto err;
         }
 
@@ -301,14 +311,15 @@ int __init make_umid(void)
 
 static int __init make_umid_init(void)
 {
-        if(!make_umid())
+        if (!make_umid())
                 return 0;
 
-        /* If initializing with the given umid failed, then try again with
+        /*
+         * If initializing with the given umid failed, then try again with
          * a random one.
          */
-        printk("Failed to initialize umid \"%s\", trying with a random umid\n",
-               umid);
+        printk(UM_KERN_ERR "Failed to initialize umid \"%s\", trying with a "
+               "random umid\n", umid);
         *umid = '\0';
         make_umid();
 
@@ -322,12 +333,12 @@ int __init umid_file_name(char *name, char *buf, int len)
         int n, err;
 
         err = make_umid();
-        if(err)
+        if (err)
                 return err;
 
         n = snprintf(buf, len, "%s%s/%s", uml_dir, umid, name);
-        if(n >= len){
-                printk("umid_file_name : buffer too short\n");
+        if (n >= len) {
+                printk(UM_KERN_ERR "umid_file_name : buffer too short\n");
                 return -E2BIG;
         }
 
@@ -341,21 +352,22 @@ char *get_umid(void)
 
 static int __init set_uml_dir(char *name, int *add)
 {
-        if(*name == '\0'){
+        if (*name == '\0') {
                 printf("uml_dir can't be an empty string\n");
                 return 0;
         }
 
-        if(name[strlen(name) - 1] == '/'){
+        if (name[strlen(name) - 1] == '/') {
                 uml_dir = name;
                 return 0;
         }
 
         uml_dir = malloc(strlen(name) + 2);
-        if(uml_dir == NULL){
+        if (uml_dir == NULL) {
                 printf("Failed to malloc uml_dir - error = %d\n", errno);
 
-                /* Return 0 here because do_initcalls doesn't look at
+                /*
+                 * Return 0 here because do_initcalls doesn't look at
                  * the return value.
                  */
                 return 0;
@@ -376,7 +388,7 @@ static void remove_umid_dir(void)
 
         sprintf(dir, "%s%s", uml_dir, umid);
         err = remove_files_and_dir(dir);
-        if(err)
+        if (err)
                 printf("remove_umid_dir - remove_files_and_dir failed with "
                        "err = %d\n", err);
 }