Index: uspace/app/blkdump/blkdump.c
===================================================================
--- uspace/app/blkdump/blkdump.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/app/blkdump/blkdump.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -142,5 +142,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+	rc = block_init(service_id, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": Error initializing libblock.\n");
Index: uspace/app/hdisk/hdisk.c
===================================================================
--- uspace/app/hdisk/hdisk.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/app/hdisk/hdisk.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -82,5 +82,5 @@
 	label.device = dev_handle;
 	
-	rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+	rc = block_init(dev_handle, 512);
 	if (rc != EOK) {
 		printf("Error during libblock init: %d - %s.\n", rc, str_error(rc));
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/app/mkexfat/mkexfat.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -803,5 +803,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+	rc = block_init(service_id, 2048);
 	if (rc != EOK) {
 		printf(NAME ": Error initializing libblock.\n");
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/app/mkfat/mkfat.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -162,5 +162,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+	rc = block_init(service_id, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": Error initializing libblock.\n");
Index: uspace/app/mkmfs/mkmfs.c
===================================================================
--- uspace/app/mkmfs/mkmfs.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/app/mkmfs/mkmfs.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -209,5 +209,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+	rc = block_init(service_id, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": Error initializing libblock.\n");
Index: uspace/lib/bithenge/src/helenos/block.c
===================================================================
--- uspace/lib/bithenge/src/helenos/block.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/bithenge/src/helenos/block.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -102,5 +102,5 @@
 	// Initialize libblock
 	int rc;
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+	rc = block_init(service_id, 2048);
 	if (rc != EOK)
 		return rc;
Index: uspace/lib/block/block.c
===================================================================
--- uspace/lib/block/block.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/block/block.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -144,10 +144,9 @@
 }
 
-int block_init(exch_mgmt_t mgmt, service_id_t service_id,
-    size_t comm_size)
+int block_init(service_id_t service_id, size_t comm_size)
 {
 	bd_t *bd;
 
-	async_sess_t *sess = loc_service_connect(mgmt, service_id,
+	async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, service_id,
 	    IPC_FLAG_BLOCKING);
 	if (!sess) {
Index: uspace/lib/block/block.h
===================================================================
--- uspace/lib/block/block.h	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/block/block.h	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -99,5 +99,5 @@
 };
 
-extern int block_init(exch_mgmt_t, service_id_t, size_t);
+extern int block_init(service_id_t, size_t);
 extern void block_fini(service_id_t);
 
Index: uspace/lib/ext4/libext4_filesystem.c
===================================================================
--- uspace/lib/ext4/libext4_filesystem.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/ext4/libext4_filesystem.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -61,5 +61,5 @@
 
 	/* Initialize block library (4096 is size of communication channel) */
-	rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096);
+	rc = block_init(fs->device, 4096);
 	if (rc != EOK)
 		goto err;
Index: uspace/lib/gpt/libgpt.c
===================================================================
--- uspace/lib/gpt/libgpt.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/gpt/libgpt.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -137,5 +137,5 @@
 int gpt_read_header(gpt_label_t *label, service_id_t dev_handle)
 {
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+	int rc = block_init(dev_handle, 512);
 	if (rc != EOK)
 		return rc;
@@ -191,5 +191,5 @@
 {
 	/* The comm_size argument (the last one) is ignored */
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+	int rc = block_init(dev_handle, 4096);
 	if ((rc != EOK) && (rc != EEXIST))
 		return rc;
@@ -288,6 +288,5 @@
 	}
 	
-	int rc = block_init(EXCHANGE_SERIALIZE, label->device,
-	    sizeof(gpt_entry_t));
+	int rc = block_init(label->device, sizeof(gpt_entry_t));
 	if (rc != EOK) {
 		gpt_free_partitions(label->parts);
@@ -348,5 +347,5 @@
 {
 	/* comm_size of 4096 is ignored */
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+	int rc = block_init(dev_handle, 4096);
 	if ((rc != EOK) && (rc != EEXIST))
 		return rc;
Index: uspace/lib/mbr/libmbr.c
===================================================================
--- uspace/lib/mbr/libmbr.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/lib/mbr/libmbr.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -109,5 +109,5 @@
 	}
 	
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+	int rc = block_init(dev_handle, 512);
 	if (rc != EOK)
 		return rc;
@@ -133,5 +133,5 @@
 int mbr_write_mbr(mbr_label_t *label, service_id_t dev_handle)
 {
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+	int rc = block_init(dev_handle, 512);
 	if (rc != EOK)
 		return rc;
@@ -227,5 +227,5 @@
 		label->mbr = mbr_alloc_mbr();
 	
-	int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+	int rc = block_init(dev_handle, 512);
 	if (rc != EOK)
 		return rc;
@@ -413,5 +413,5 @@
 mbr_err_val mbr_add_partition(mbr_label_t *label, mbr_part_t *part)
 {
-	int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+	int rc = block_init(label->device, 512);
 	if ((rc != EOK) && (rc != EEXIST))
 		return ERR_LIBBLOCK;
@@ -622,5 +622,5 @@
 	uint32_t addr = base;
 	
-	int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+	int rc = block_init(label->device, 512);
 	if (rc != EOK)
 		goto end;
Index: uspace/srv/bd/part/guid_part/guid_part.c
===================================================================
--- uspace/srv/bd/part/guid_part/guid_part.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/bd/part/guid_part/guid_part.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -160,5 +160,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
+	rc = block_init(indev_sid, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": could not init libblock.\n");
Index: uspace/srv/bd/part/mbr_part/mbr_part.c
===================================================================
--- uspace/srv/bd/part/mbr_part/mbr_part.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/bd/part/mbr_part/mbr_part.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -210,5 +210,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
+	rc = block_init(indev_sid, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": could not init libblock.\n");
Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -1025,5 +1025,5 @@
 {
 	/* Initialize the block layer */
-	int rc = block_init(EXCHANGE_SERIALIZE, service_id, BLOCK_SIZE);
+	int rc = block_init(service_id, BLOCK_SIZE);
 	if (rc != EOK)
 		return rc;
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -1067,5 +1067,5 @@
 
 	/* initialize libblock */
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
+	rc = block_init(service_id, BS_SIZE);
 	if (rc != EOK)
 		return rc;
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/fat/fat_ops.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -939,5 +939,5 @@
 
 	/* initialize libblock */
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
+	rc = block_init(service_id, BS_SIZE);
 	if (rc != EOK) {
 		free(instance);
Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -161,5 +161,5 @@
 
 	/* initialize libblock */
-	rc = block_init(EXCHANGE_SERIALIZE, service_id, 4096);
+	rc = block_init(service_id, 4096);
 	if (rc != EOK)
 		return rc;
Index: uspace/srv/fs/tmpfs/tmpfs_dump.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -169,5 +169,5 @@
 	int rc;
 
-	rc = block_init(EXCHANGE_SERIALIZE, dsid, TMPFS_COMM_SIZE);
+	rc = block_init(dsid, TMPFS_COMM_SIZE);
 	if (rc != EOK)
 		return false; 
Index: uspace/srv/fs/udf/udf_ops.c
===================================================================
--- uspace/srv/fs/udf/udf_ops.c	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
+++ uspace/srv/fs/udf/udf_ops.c	(revision fc22069bde020238acd12a7eb6194ef878fc7e34)
@@ -325,5 +325,5 @@
 	
 	/* initialize block cache */
-	int rc = block_init(EXCHANGE_SERIALIZE, service_id, MAX_SIZE);
+	int rc = block_init(service_id, MAX_SIZE);
 	if (rc != EOK)
 		return rc;