Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 72fda538620b1661828a7b349dac04ae1ae229ac)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 8d6a41cc7b5319a4afd5de1393888f5024781b11)
@@ -68,16 +68,14 @@
 	get_mtab_list(&mtab_list);
 
-	mtab_list_ent_t *old_ent = NULL;
+	mtab_ent_t *old_ent = NULL;
 
 	list_foreach(mtab_list, cur) {
-		mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+		mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
 		    link);
-
-		mtab_ent_t *mtab_ent = &ent->mtab_ent;
 
 		if (old_ent)
 			free(old_ent);
 
-		old_ent = ent;
+		old_ent = mtab_ent;
 
 		printf("%s on %s ", mtab_ent->fs_name, mtab_ent->mp);
Index: uspace/lib/c/generic/vfs/vfs.c
===================================================================
--- uspace/lib/c/generic/vfs/vfs.c	(revision 72fda538620b1661828a7b349dac04ae1ae229ac)
+++ uspace/lib/c/generic/vfs/vfs.c	(revision 8d6a41cc7b5319a4afd5de1393888f5024781b11)
@@ -35,5 +35,4 @@
 #include <vfs/canonify.h>
 #include <vfs/vfs.h>
-#include <vfs/vfs_mtab.h>
 #include <vfs/vfs_sess.h>
 #include <macros.h>
@@ -849,16 +848,13 @@
 
 	for (i = 0; i < num_mounted_fs; ++i) {
-		mtab_list_ent_t *mtab_list_ent;
 		mtab_ent_t *mtab_ent;
 
-		mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
-		if (!mtab_list_ent) {
+		mtab_ent = malloc(sizeof(mtab_ent_t));
+		if (!mtab_ent) {
 			rc = ENOMEM;
 			goto exit;
 		}
 
-		memset(mtab_list_ent, 0, sizeof(mtab_list_ent_t));
-
-		mtab_ent = &mtab_list_ent->mtab_ent;
+		memset(mtab_ent, 0, sizeof(mtab_ent_t));
 
 		rc = async_data_read_start(exch, (void *) mtab_ent->mp,
@@ -890,6 +886,6 @@
 		mtab_ent->fs_handle = p[2];
 
-		link_initialize(&mtab_list_ent->link);
-		list_append(&mtab_list_ent->link, mtab_list);
+		link_initialize(&mtab_ent->link);
+		list_append(&mtab_ent->link, mtab_list);
 	}
 
Index: uspace/lib/c/include/vfs/vfs_mtab.h
===================================================================
--- uspace/lib/c/include/vfs/vfs_mtab.h	(revision 72fda538620b1661828a7b349dac04ae1ae229ac)
+++ uspace/lib/c/include/vfs/vfs_mtab.h	(revision 8d6a41cc7b5319a4afd5de1393888f5024781b11)
@@ -40,4 +40,5 @@
 
 typedef struct mtab_ent {
+	link_t link;
 	char mp[MAX_PATH_LEN];
 	char opts[MAX_MNTOPTS_LEN];
@@ -48,9 +49,4 @@
 } mtab_ent_t;
 
-typedef struct mtab_list_ent {
-	link_t link;
-	mtab_ent_t mtab_ent;
-} mtab_list_ent_t;
-
 #endif
 
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision 72fda538620b1661828a7b349dac04ae1ae229ac)
+++ uspace/srv/vfs/vfs_ops.c	(revision 8d6a41cc7b5319a4afd5de1393888f5024781b11)
@@ -362,6 +362,6 @@
 
 	/* Add the filesystem info to the list of mounted filesystems */
-	mtab_list_ent_t *mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
-	if (!mtab_list_ent) {
+	mtab_ent_t *mtab_ent = malloc(sizeof(mtab_ent_t));
+	if (!mtab_ent) {
 		async_answer_0(callid, ENOMEM);
 		async_answer_0(rid, ENOMEM);
@@ -371,6 +371,4 @@
 		return;
 	}
-
-	mtab_ent_t *mtab_ent = &mtab_list_ent->mtab_ent;
 
 	mtab_ent->fs_handle = fs_handle;
@@ -381,8 +379,8 @@
 	mtab_ent->instance = instance;
 
-	link_initialize(&mtab_list_ent->link);
+	link_initialize(&mtab_ent->link);
 
 	fibril_mutex_lock(&mtab_list_lock);
-	list_append(&mtab_list_ent->link, &mtab_list);
+	list_append(&mtab_ent->link, &mtab_list);
 	mtab_size++;
 	fibril_mutex_unlock(&mtab_list_lock);
@@ -538,13 +536,11 @@
 
 	list_foreach(mtab_list, cur) {
-		mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+		mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
 		    link);
 
-		mtab_ent_t *mtab_ent = &ent->mtab_ent;
-
 		if (str_cmp(mtab_ent->mp, mp) == 0) {
-			list_remove(&ent->link);
+			list_remove(&mtab_ent->link);
 			mtab_size--;
-			free(ent);
+			free(mtab_ent);
 			found = 1;
 			break;
@@ -1363,8 +1359,6 @@
 
 	list_foreach(mtab_list, cur) {
-		mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+		mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
 		    link);
-
-		mtab_ent_t *mtab_ent = &ent->mtab_ent;
 
 		rc = ENOTSUP;