Index: uspace/srv/fs/minixfs/mfs.h
===================================================================
--- uspace/srv/fs/minixfs/mfs.h	(revision c699b0c822664d5453a8b361e77a832b578b588a)
+++ uspace/srv/fs/minixfs/mfs.h	(revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572)
@@ -155,37 +155,37 @@
 /*mfs_inode.c*/
 extern int
-get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
 	  fs_index_t index);
 
 extern int
-put_inode(struct mfs_node *mnode);
-
-extern int
-inode_shrink(struct mfs_node *mnode, size_t size_shrink);
+mfs_put_inode(struct mfs_node *mnode);
+
+extern int
+mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink);
 
 /*mfs_rw.c*/
 extern int
-read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
-
-extern int
-write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone,
+mfs_read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
+
+extern int
+mfs_write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone,
 	  uint32_t *old_zone);
 
 extern int
-prune_ind_zones(struct mfs_node *mnode, size_t new_size);
+mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size);
 
 /*mfs_dentry.c*/
 extern int
-read_dentry(struct mfs_node *mnode,
+mfs_read_dentry(struct mfs_node *mnode,
 		     struct mfs_dentry_info *d_info, unsigned index);
 
 extern int
-write_dentry(struct mfs_dentry_info *d_info);
-
-extern int
-remove_dentry(struct mfs_node *mnode, const char *d_name);
-
-extern int
-insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum);
+mfs_write_dentry(struct mfs_dentry_info *d_info);
+
+extern int
+mfs_remove_dentry(struct mfs_node *mnode, const char *d_name);
+
+extern int
+mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum);
 
 /*mfs_balloc.c*/
Index: uspace/srv/fs/minixfs/mfs_dentry.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_dentry.c	(revision c699b0c822664d5453a8b361e77a832b578b588a)
+++ uspace/srv/fs/minixfs/mfs_dentry.c	(revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572)
@@ -43,5 +43,5 @@
  */
 int
-read_dentry(struct mfs_node *mnode,
+mfs_read_dentry(struct mfs_node *mnode,
 		     struct mfs_dentry_info *d_info, unsigned index)
 {
@@ -52,5 +52,5 @@
 	block_t *b;
 
-	int r = read_map(&block, mnode, index * sbi->dirsize);
+	int r = mfs_read_map(&block, mnode, index * sbi->dirsize);
 	if (r != EOK)
 		goto out_err;
@@ -104,5 +104,5 @@
  */
 int
-write_dentry(struct mfs_dentry_info *d_info)
+mfs_write_dentry(struct mfs_dentry_info *d_info)
 {
 	struct mfs_node *mnode = d_info->node;
@@ -114,5 +114,5 @@
 	int r;
 
-	r = read_map(&block, mnode, d_off_bytes);
+	r = mfs_read_map(&block, mnode, d_off_bytes);
 	if (r != EOK)
 		goto out;
@@ -155,5 +155,5 @@
  */
 int
-remove_dentry(struct mfs_node *mnode, const char *d_name)
+mfs_remove_dentry(struct mfs_node *mnode, const char *d_name)
 {
 	struct mfs_sb_info *sbi = mnode->instance->sbi;
@@ -169,5 +169,5 @@
 	unsigned i;
 	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
-		r = read_dentry(mnode, &d_info, i);
+		r = mfs_read_dentry(mnode, &d_info, i);
 		if (r != EOK)
 			return r;
@@ -178,5 +178,5 @@
 				!bcmp(d_info.d_name, d_name, name_len)) {
 			d_info.d_inum = 0;
-			r = write_dentry(&d_info);
+			r = mfs_write_dentry(&d_info);
 			return r;
 		}
@@ -195,5 +195,5 @@
  */
 int
-insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum)
+mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum)
 {
 	int r;
@@ -210,5 +210,5 @@
 	unsigned i;
 	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
-		r = read_dentry(mnode, &d_info, i);
+		r = mfs_read_dentry(mnode, &d_info, i);
 		if (r != EOK)
 			return r;
@@ -224,5 +224,5 @@
 		uint32_t b, pos;
 		pos = mnode->ino_i->i_size;
-		r = read_map(&b, mnode, pos);
+		r = mfs_read_map(&b, mnode, pos);
 		if (r != EOK)
 			goto out;
@@ -235,5 +235,5 @@
 			if (r != EOK)
 				goto out;
-			r = write_map(mnode, pos, b, &dummy);
+			r = mfs_write_map(mnode, pos, b, &dummy);
 			if (r != EOK)
 				goto out;
@@ -251,5 +251,5 @@
 	d_info.d_name[name_len] = 0;
 
-	r = write_dentry(&d_info);
+	r = mfs_write_dentry(&d_info);
 out:
 	return r;
Index: uspace/srv/fs/minixfs/mfs_inode.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_inode.c	(revision c699b0c822664d5453a8b361e77a832b578b588a)
+++ uspace/srv/fs/minixfs/mfs_inode.c	(revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572)
@@ -50,5 +50,5 @@
 
 int
-get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
 	  fs_index_t index)
 {
@@ -186,5 +186,5 @@
 
 int
-put_inode(struct mfs_node *mnode)
+mfs_put_inode(struct mfs_node *mnode)
 {
 	int rc = EOK;
@@ -300,5 +300,5 @@
 
 int
-inode_shrink(struct mfs_node *mnode, size_t size_shrink)
+mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink)
 {
 	struct mfs_sb_info *sbi = mnode->instance->sbi;
@@ -333,5 +333,5 @@
 		uint32_t old_zone;
 
-		r = write_map(mnode, pos, 0, &old_zone);
+		r = mfs_write_map(mnode, pos, 0, &old_zone);
 		if (r != EOK)
 			goto exit_error;
@@ -349,5 +349,5 @@
 	ino_i->i_size = new_size;
 
-	return prune_ind_zones(mnode, new_size);
+	return mfs_prune_ind_zones(mnode, new_size);
 
 exit_error:
Index: uspace/srv/fs/minixfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_ops.c	(revision c699b0c822664d5453a8b361e77a832b578b588a)
+++ uspace/srv/fs/minixfs/mfs_ops.c	(revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572)
@@ -183,4 +183,6 @@
 	sb = malloc(MFS_SUPERBLOCK_SIZE);
 	if (!sb) {
+		free(instance);
+		free(sbi);
 		block_fini(service_id);
 		return ENOMEM;
@@ -190,4 +192,7 @@
 	rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 1, sb);
 	if (rc != EOK) {
+		free(instance);
+		free(sbi);
+		free(sb);
 		block_fini(service_id);
 		return rc;
@@ -204,4 +209,7 @@
 	if (!check_magic_number(sb3->s_magic, &native, &version, &longnames)) {
 		mfsdebug("magic number not recognized\n");
+		free(instance);
+		free(sbi);
+		free(sb);
 		block_fini(service_id);
 		return ENOTSUP;
@@ -262,6 +270,7 @@
 	rc = block_cache_init(service_id, sbi->block_size, 0, cmode);
 	if (rc != EOK) {
+		free(instance);
 		free(sbi);
-		free(instance);
+		free(sb);
 		block_cache_fini(service_id);
 		block_fini(service_id);
@@ -433,5 +442,5 @@
 	unsigned i;
 	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
-		r = read_dentry(mnode, &d_info, i);
+		r = mfs_read_dentry(mnode, &d_info, i);
 		if (r != EOK)
 			return r;
@@ -504,5 +513,5 @@
 		assert(mnode->instance->open_nodes_cnt > 0);
 		mnode->instance->open_nodes_cnt--;
-		rc = put_inode(mnode);
+		rc = mfs_put_inode(mnode);
 		free(mnode->ino_i);
 		free(mnode);
@@ -586,5 +595,5 @@
 	struct mfs_ino_info *ino_i;
 
-	rc = get_inode(inst, &ino_i, index);
+	rc = mfs_get_inode(inst, &ino_i, index);
 	if (rc != EOK)
 		goto out_err;
@@ -645,15 +654,15 @@
 		return ENAMETOOLONG;
 
-	int r = insert_dentry(parent, name, child->ino_i->index);
+	int r = mfs_insert_dentry(parent, name, child->ino_i->index);
 	if (r != EOK)
 		goto exit_error;
 
 	if (S_ISDIR(child->ino_i->i_mode)) {
-		r = insert_dentry(child, ".", child->ino_i->index);
+		r = mfs_insert_dentry(child, ".", child->ino_i->index);
 		if (r != EOK)
 			goto exit_error;
 		//child->ino_i->i_nlinks++;
 		//child->ino_i->dirty = true;
-		r = insert_dentry(child, "..", parent->ino_i->index);
+		r = mfs_insert_dentry(child, "..", parent->ino_i->index);
 		if (r != EOK)
 			goto exit_error;
@@ -686,5 +695,5 @@
 		return ENOTEMPTY;
 
-	r = remove_dentry(parent, name);
+	r = mfs_remove_dentry(parent, name);
 	if (r != EOK)
 		return r;
@@ -722,5 +731,5 @@
 	unsigned i;
 	for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
-		r = read_dentry(mnode, &d_info, i);
+		r = mfs_read_dentry(mnode, &d_info, i);
 		if (r != EOK)
 			return r;
@@ -774,5 +783,5 @@
 
 		for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) {
-			rc = read_dentry(mnode, &d_info, pos);
+			rc = mfs_read_dentry(mnode, &d_info, pos);
 			if (rc != EOK)
 				goto out_error;
@@ -807,5 +816,5 @@
 		block_t *b;
 
-		rc = read_map(&zone, mnode, pos);
+		rc = mfs_read_map(&zone, mnode, pos);
 		if (rc != EOK)
 			goto out_error;
@@ -883,5 +892,5 @@
 
 	if (pos < boundary) {
-		r = read_map(&block, mnode, pos);
+		r = mfs_read_map(&block, mnode, pos);
 		if (r != EOK)
 			goto out_err;
@@ -901,5 +910,5 @@
 			goto out_err;
 
-		r = write_map(mnode, pos, block, &dummy);
+		r = mfs_write_map(mnode, pos, block, &dummy);
 		if (r != EOK)
 			goto out_err;
@@ -972,5 +981,5 @@
 
 	/*Free the entire inode content*/
-	r = inode_shrink(mnode, mnode->ino_i->i_size);
+	r = mfs_inode_shrink(mnode, mnode->ino_i->i_size);
 	if (r != EOK)
 		goto out;
@@ -1000,5 +1009,5 @@
 		r = EOK;
 	else
-		r = inode_shrink(mnode, ino_i->i_size - size);
+		r = mfs_inode_shrink(mnode, ino_i->i_size - size);
 
 	mfs_node_put(fn);
Index: uspace/srv/fs/minixfs/mfs_rw.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_rw.c	(revision c699b0c822664d5453a8b361e77a832b578b588a)
+++ uspace/srv/fs/minixfs/mfs_rw.c	(revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572)
@@ -56,5 +56,5 @@
  */
 int
-read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
+mfs_read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
 {
 	int r;
@@ -78,5 +78,5 @@
 
 int
-write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone,
+mfs_write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone,
 	  uint32_t *old_zone)
 {
@@ -229,5 +229,5 @@
 /*Free unused indirect zones*/
 int
-prune_ind_zones(struct mfs_node *mnode, size_t new_size)
+mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
 {
 	struct mfs_instance *inst = mnode->instance;