Index: uspace/srv/fs/minixfs/mfs.h
===================================================================
--- uspace/srv/fs/minixfs/mfs.h	(revision 40f7297bcecf84ab92ed6b4e342ccfe9d557ee77)
+++ uspace/srv/fs/minixfs/mfs.h	(revision c922bc74297d8e4630b58fd5498bedbf18907f12)
@@ -154,9 +154,7 @@
 
 /*mfs_inode.c*/
-extern struct mfs_ino_info *
-mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum);
-
-extern struct mfs_ino_info *
-mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum);
+int
+get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+				fs_index_t index);
 
 extern int
@@ -164,5 +162,5 @@
 
 int
-mfs_inode_grow(struct mfs_node *mnode, unsigned size_grow);
+inode_grow(struct mfs_node *mnode, unsigned size_grow);
 
 /*mfs_rw.c*/
Index: uspace/srv/fs/minixfs/mfs_inode.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_inode.c	(revision 40f7297bcecf84ab92ed6b4e342ccfe9d557ee77)
+++ uspace/srv/fs/minixfs/mfs_inode.c	(revision c922bc74297d8e4630b58fd5498bedbf18907f12)
@@ -44,5 +44,32 @@
 mfs2_write_inode_raw(struct mfs_node *mnode);
 
-struct mfs_ino_info *
+static struct mfs_ino_info *
+mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum);
+
+static struct mfs_ino_info *
+mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum);
+
+
+int
+get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+				fs_index_t index)
+{
+	struct mfs_sb_info *sbi = inst->sbi;
+
+	if (sbi->fs_version == MFS_VERSION_V1) {
+		/*Read a MFS V1 inode*/
+		*ino_i = mfs_read_inode_raw(inst, index);
+	} else {
+		/*Read a MFS V2/V3 inode*/
+		*ino_i = mfs2_read_inode_raw(inst, index);
+	}
+
+	if (*ino_i == NULL)
+		return -1;
+
+	return EOK;
+}
+
+static struct mfs_ino_info *
 mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum)
 {
@@ -100,5 +127,5 @@
 }
 
-struct mfs_ino_info *
+static struct mfs_ino_info *
 mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum)
 {
@@ -272,5 +299,5 @@
 
 int
-mfs_inode_grow(struct mfs_node *mnode, unsigned size_grow)
+inode_grow(struct mfs_node *mnode, unsigned size_grow)
 {
 	unsigned i;
Index: uspace/srv/fs/minixfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_ops.c	(revision 40f7297bcecf84ab92ed6b4e342ccfe9d557ee77)
+++ uspace/srv/fs/minixfs/mfs_ops.c	(revision c922bc74297d8e4630b58fd5498bedbf18907f12)
@@ -387,6 +387,4 @@
 	int rc;
 
-	const struct mfs_sb_info *sbi = inst->sbi;
-
 	node = malloc(sizeof(fs_node_t));
 	if (!node) {
@@ -405,13 +403,6 @@
 	struct mfs_ino_info *ino_i;
 
-	if (sbi->fs_version == MFS_VERSION_V1) {
-		/*Read MFS V1 inode*/
-		ino_i = mfs_read_inode_raw(inst, index);
-	} else {
-		/*Read MFS V2/V3 inode*/
-		ino_i = mfs2_read_inode_raw(inst, index);
-	}
-
-	if (!ino_i)
+	rc = get_inode(inst, &ino_i, index);
+	if (rc != EOK)
 		goto out_err;