--- a/src/process.c
+++ b/src/process.c
@@ -23,16 +23,15 @@
     pid_t	child_pid;
 };
 
-static char	process_system_charset[CHARSET_LEN]		= "UTF-8";
-static char	process_server_local_charset[CHARSET_LEN]	= "UTF-8";
-static char	process_server_samba_charset[CHARSET_LEN]	= "UTF-8";
-static int	process_server_listen_timeout			= 300;
-static int	process_server_smb_timeout			= 20000;
-static int	process_server_smb_debug_level			= 0;
-static int	process_start_enabled				= 1;
-
-static LIST		process_list		= STATIC_LIST_INITIALIZER(process_list);
-static pthread_mutex_t	m_process		= PTHREAD_MUTEX_INITIALIZER;
+char	process_system_charset[CHARSET_LEN]		= "UTF-8";
+char	process_server_local_charset[CHARSET_LEN]	= "UTF-8";
+char	process_server_samba_charset[CHARSET_LEN]	= "UTF-8";
+int	process_server_listen_timeout			= 300;
+int	process_server_smb_debug_level			= 0;
+int	process_start_enabled				= 1;
+
+LIST		process_list		= STATIC_LIST_INITIALIZER(process_list);
+pthread_mutex_t	m_process		= PTHREAD_MUTEX_INITIALIZER;
 
 
 int process_init(void){
@@ -61,9 +60,10 @@
 }
 
 void process_disable_new_smb_conn_starting(void){
-    DPRINTF(7, "disable new process starting at %u\n", (unsigned int) time(NULL));
     pthread_mutex_lock(&m_process);
     process_start_enabled = 0;
+    DPRINTF(7, "disable new process starting at %u\n",
+				(unsigned int) time(NULL));
     pthread_mutex_unlock(&m_process);
 }
 
@@ -76,15 +76,6 @@
     return 1;
 }
 
-int process_set_server_smb_timeout(int timeout){
-    if (timeout < 1000) return 0;
-    DPRINTF(7, "smb_timeout=%d\n", timeout);
-    pthread_mutex_lock(&m_process);
-    process_server_smb_timeout = timeout;
-    pthread_mutex_unlock(&m_process);
-    return 1;
-}
-
 int process_set_server_smb_debug_level(int level){
     if ((level < 0) || (level > 10)) return 0;
     DPRINTF(7, "level=%d\n", level);
@@ -119,17 +110,15 @@
 
 int process_start_new_smb_conn(char *shmem_ptr, size_t shmem_size){
     int			error;
-    int			debug_level;
     int			pair[2];
     pid_t		pid;
     struct process_rec	*rec;
 
-    if ((shmem_ptr == NULL) || (shmem_size < (size_t) getpagesize())){
+    if ((shmem_ptr == NULL) || ((int) shmem_size < getpagesize())){
 	errno = EINVAL;
 	return -1;
     }
 
-    error = 0;
     pid = (pid_t) (-1);
     pthread_mutex_lock(&m_process);
     if (process_start_enabled != 1){
@@ -140,24 +129,16 @@
     if ((rec = malloc(sizeof(struct process_rec))) == NULL){
 	error = errno;
 	pair[0] = -1;
-	DPRINTF(6, "starting new child failed on malloc(): errno=%d, %s\n",
-	    errno, strerror(errno));
 	goto error;
     }
     if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, pair) < 0){
-	DPRINTF(6, "using SOCK_DGRAM instead of SOCK_SEQPACKET\n");
-	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) < 0){
-	    error = errno;
-	    free(rec);
-	    pair[0] = -1;
-	    DPRINTF(6, "starting new child failed on socketpair(): errno=%d, %s\n",
-		errno, strerror(errno));
-	    goto error;
-	}
+	error = errno;
+	free(rec);
+	pair[0] = -1;
+	goto error;
     }
 
     memset(rec, 0, sizeof(struct process_rec));
-    debug_level = common_get_smbnetfs_debug_level();
 
     if ((pid = fork()) == -1){
 	error = errno;
@@ -165,8 +146,6 @@
 	close(pair[1]);
 	free(rec);
 	pair[0] = -1;
-	DPRINTF(6, "starting new child failed on fork(): errno=%d, %s\n",
-	    errno, strerror(errno));
 	goto error;
     }
 
@@ -176,16 +155,10 @@
 	pthread_mutex_unlock(&m_process);
 	close(pair[0]);
 
-	/* We are after fork here, so we are in single thread situation. *
-	 * This mean we may read any variable without acquiring locks.   *
-	 * Moreover, we can NOT use safely any mutex protected code,     *
-	 * as the mutexes after the fork() are in UNKNOWN state          */
 	srv_ctx.conn_fd         = pair[1];
 	srv_ctx.shmem_ptr       = shmem_ptr;
 	srv_ctx.shmem_size      = shmem_size;
 	srv_ctx.timeout         = process_server_listen_timeout;
-	srv_ctx.smb_timeout     = process_server_smb_timeout;
-	srv_ctx.debug_level     = debug_level;
 	srv_ctx.smb_debug_level = process_server_smb_debug_level;
 	srv_ctx.samba_charset   = process_server_samba_charset;
 	srv_ctx.local_charset   = process_server_local_charset;
@@ -201,7 +174,6 @@
 
   error:
     pthread_mutex_unlock(&m_process);
-    errno = error;
     return pair[0];
 }