Index: uspace/srv/fs/minixfs/mfs.h
===================================================================
--- uspace/srv/fs/minixfs/mfs.h	(revision 5222e7468293106dbf238018ae450930a36be58c)
+++ uspace/srv/fs/minixfs/mfs.h	(revision e03d545524b08bb45e88334bed00ae0f4a5311cc)
@@ -159,5 +159,5 @@
 
 extern int
-mfs_put_inode(struct mfs_node *mnode);
+mfs_put_inode_core(struct mfs_node *mnode);
 
 extern int
Index: uspace/srv/fs/minixfs/mfs_inode.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_inode.c	(revision 5222e7468293106dbf238018ae450930a36be58c)
+++ uspace/srv/fs/minixfs/mfs_inode.c	(revision e03d545524b08bb45e88334bed00ae0f4a5311cc)
@@ -186,5 +186,5 @@
 
 int
-mfs_put_inode(struct mfs_node *mnode)
+mfs_put_inode_core(struct mfs_node *mnode)
 {
 	int rc = EOK;
Index: uspace/srv/fs/minixfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_ops.c	(revision 5222e7468293106dbf238018ae450930a36be58c)
+++ uspace/srv/fs/minixfs/mfs_ops.c	(revision e03d545524b08bb45e88334bed00ae0f4a5311cc)
@@ -191,5 +191,5 @@
 
 	/* Read the superblock */
-	rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 1, sb);
+	rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 2, sb);
 	if (rc != EOK) {
 		free(instance);
@@ -513,5 +513,5 @@
 		assert(mnode->instance->open_nodes_cnt > 0);
 		mnode->instance->open_nodes_cnt--;
-		rc = mfs_put_inode(mnode);
+		rc = mfs_put_inode_core(mnode);
 		free(mnode->ino_i);
 		free(mnode);
@@ -961,6 +961,5 @@
 
 	/*Destroy the inode*/
-	r = mfs_destroy_node(fn);
-	return r;
+	return mfs_destroy_node(fn);
 }
 
@@ -979,10 +978,4 @@
 
 	assert(!has_children);
-
-	if (mnode->ino_i->i_nlinks > 0) {
-		mfsdebug("nlinks = %d", mnode->ino_i->i_nlinks);
-		r = EOK;
-		goto out;
-	}
 
 	/*Free the entire inode content*/
@@ -990,4 +983,6 @@
 	if (r != EOK)
 		goto out;
+
+	/*Mark the inode as free in the bitmap*/
 	r = mfs_free_inode(mnode->instance, mnode->ino_i->index);