Index: uspace/srv/fs/minixfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_ops.c	(revision b89281be0d389b174834abb609abf7275f5b93b4)
+++ uspace/srv/fs/minixfs/mfs_ops.c	(revision 3f3e5b552799d28a436d05bc65dbc6c6ee680c34)
@@ -539,4 +539,5 @@
 	r = mfs_has_children(&has_children, cfn);
 	on_error(r, return r);
+
 	if (has_children)
 		return ENOTEMPTY;
@@ -570,5 +571,5 @@
 	/* The first two dentries are always . and .. */
 	unsigned i;
-	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+	for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
 		r = read_directory_entry(mnode, &d_info, i);
 		on_error(r, return r);
@@ -623,6 +624,5 @@
 		struct mfs_sb_info *sbi = mnode->instance->sbi;
 
-		unsigned i;
-		for (i = pos; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+		for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) {
 			rc = read_directory_entry(mnode, &d_info, pos);
 			on_error(rc, goto out_error);
@@ -632,5 +632,4 @@
 				goto found;
 			}
-			pos++;
 		}