Index: uspace/srv/fs/mfs/mfs_rw.c
===================================================================
--- uspace/srv/fs/mfs/mfs_rw.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/fs/mfs/mfs_rw.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -34,18 +34,18 @@
 #include "mfs.h"
 
-static int
+static errno_t
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block);
 
-static int
+static errno_t
 reset_zone_content(struct mfs_instance *inst, uint32_t zone);
 
-static int
+static errno_t
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone);
 
-static int
+static errno_t
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone);
 
-static int
+static errno_t
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone);
 
@@ -61,8 +61,8 @@
  * @return	EOK on success or an error code.
  */
-int
+errno_t
 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
 {
-	int r;
+	errno_t r;
 	const struct mfs_sb_info *sbi = mnode->instance->sbi;
 	const int block_size = sbi->block_size;
@@ -83,5 +83,5 @@
 }
 
-int
+errno_t
 mfs_write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone,
     uint32_t *old_zone)
@@ -100,5 +100,5 @@
 }
 
-static int
+static errno_t
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block)
@@ -107,5 +107,5 @@
 	int ptrs_per_block;
 	uint32_t *ind_zone = NULL, *ind2_zone = NULL;
-	int r = EOK;
+	errno_t r = EOK;
 
 	struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -238,5 +238,5 @@
  * @return		EOK on success or an error code.
  */
-int
+errno_t
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
 {
@@ -245,5 +245,5 @@
 	struct mfs_ino_info *ino_i = mnode->ino_i;
 	int nr_direct, ptrs_per_block, rblock;
-	int r;
+	errno_t r;
 	int i;
 
@@ -312,9 +312,9 @@
 }
 
-static int
+static errno_t
 reset_zone_content(struct mfs_instance *inst, uint32_t zone)
 {
 	block_t *b;
-	int r;
+	errno_t r;
 
 	r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
@@ -328,8 +328,8 @@
 }
 
-static int
+static errno_t
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone)
 {
-	int r;
+	errno_t r;
 
 	r = mfs_alloc_zone(inst, zone);
@@ -341,9 +341,9 @@
 }
 
-static int
+static errno_t
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone)
 {
 	struct mfs_sb_info *sbi = inst->sbi;
-	int r;
+	errno_t r;
 	unsigned i;
 	block_t *b;
@@ -376,9 +376,9 @@
 }
 
-static int
+static errno_t
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone)
 {
 	struct mfs_sb_info *sbi = inst->sbi;
-	int r;
+	errno_t r;
 	unsigned i;
 	block_t *b;