Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision d51db079aa01ad329ce298e255b1840cd48189bb)
+++ uspace/srv/vfs/vfs.c	(revision 6c89f20d4b14cbd0a3794d94dcc96312477bbf1f)
@@ -48,4 +48,6 @@
 #include "vfs.h"
 
+#define NAME "vfs"
+
 #define dprintf(...)	printf(__VA_ARGS__)
 
@@ -53,6 +55,4 @@
 {
 	bool keep_on_going = 1;
-
-	printf("Connection opened from %p\n", icall->in_phone_hash);
 
 	/*
@@ -78,6 +78,4 @@
 		callid = async_get_call(&call);
 
-		printf("Received call, method=%d\n", IPC_GET_METHOD(call));
-		
 		switch (IPC_GET_METHOD(call)) {
 		case IPC_M_PHONE_HUNGUP:
@@ -132,5 +130,5 @@
 	ipcarg_t phonead;
 
-	printf("VFS: HelenOS VFS server\n");
+	printf(NAME ": HelenOS VFS server\n");
 
 	/*
@@ -143,5 +141,5 @@
 	 */
 	if (!vfs_nodes_init()) {
-		printf("Failed to initialize the VFS node hash table.\n");
+		printf(NAME ": Failed to initialize VFS node hash table\n");
 		return ENOMEM;
 	}
@@ -153,10 +151,10 @@
 	plb = as_get_mappable_page(PLB_SIZE);
 	if (!plb) {
-		printf("Cannot allocate a mappable piece of address space\n");
+		printf(NAME ": Cannot allocate a mappable piece of address space\n");
 		return ENOMEM;
 	}
 	if (as_area_create(plb, PLB_SIZE, AS_AREA_READ | AS_AREA_WRITE |
 	    AS_AREA_CACHEABLE) != plb) {
-		printf("Cannot create address space area.\n");
+		printf(NAME ": Cannot create address space area\n");
 		return ENOMEM;
 	}
@@ -176,4 +174,5 @@
 	 * Start accepting connections.
 	 */
+	printf(NAME ": Accepting connections\n");
 	async_manager();
 	return 0;
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision d51db079aa01ad329ce298e255b1840cd48189bb)
+++ uspace/srv/vfs/vfs.h	(revision 6c89f20d4b14cbd0a3794d94dcc96312477bbf1f)
@@ -41,5 +41,8 @@
 #include <bool.h>
 
-#define dprintf(...)	printf(__VA_ARGS__)
+// FIXME: according to CONFIG_DEBUG
+// #define dprintf(...)	printf(__VA_ARGS__)
+
+#define dprintf(...)
 
 #define VFS_FIRST	IPC_FIRST_USER_METHOD
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision d51db079aa01ad329ce298e255b1840cd48189bb)
+++ uspace/srv/vfs/vfs_ops.c	(revision 6c89f20d4b14cbd0a3794d94dcc96312477bbf1f)
@@ -445,5 +445,5 @@
 
 	int fd = IPC_GET_ARG1(*request);
-
+	
 	/* Lookup the file structure corresponding to the file descriptor. */
 	vfs_file_t *file = vfs_file_get(fd);
@@ -452,5 +452,5 @@
 		return;
 	}
-
+	
 	/*
 	 * Now we need to receive a call with client's
@@ -468,5 +468,5 @@
 		return;
 	}
-
+	
 	/*
 	 * Lock the open file structure so that no other thread can manipulate
@@ -474,5 +474,5 @@
 	 */
 	futex_down(&file->lock);
-
+	
 	/*
 	 * Lock the file's node so that no other client can read/write to it at
@@ -483,5 +483,5 @@
 	else
 		rwlock_write_lock(&file->node->contents_rwlock);
-
+	
 	int fs_phone = vfs_grab_phone(file->node->fs_handle);	
 	
@@ -501,12 +501,12 @@
 	 */
 	ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-
+	
 	vfs_release_phone(fs_phone);
-
+	
 	/* Wait for reply from the FS server. */
 	ipcarg_t rc;
 	async_wait_for(msg, &rc);
 	size_t bytes = IPC_GET_ARG1(answer);
-
+	
 	/* Unlock the VFS node. */
 	if (read)
@@ -518,10 +518,10 @@
 		rwlock_write_unlock(&file->node->contents_rwlock);
 	}
-
+	
 	/* Update the position pointer and unlock the open file. */
 	if (rc == EOK)
 		file->pos += bytes;
 	futex_up(&file->lock);
-
+	
 	/*
 	 * FS server's reply is the final result of the whole operation we