Index: uspace/srv/vfs/vfs_mount.c
===================================================================
--- uspace/srv/vfs/vfs_mount.c	(revision b818cffb2cdbbb47bb911eb1870da1165d104a9f)
+++ uspace/srv/vfs/vfs_mount.c	(revision 44358c12a5b7703b2d4a2693fb0d298ad39bdfaa)
@@ -66,4 +66,5 @@
 {
 	int dev_handle;
+	vfs_node_t *mp_node = NULL;
 
 	/*
@@ -137,4 +138,7 @@
 	/*
 	 * Lookup the root node of the filesystem being mounted.
+	 * In this case, we don't need to take the unlink_futex as the root node
+	 * cannot be removed. However, we do take a reference to it so that
+	 * we can track how many times it has been mounted.
 	 */
 	int rc;
@@ -146,4 +150,10 @@
 		return;
 	}
+	vfs_node_t *mr_node = vfs_node_get(&mounted_root);
+	if (!mr_node) {
+		free(buf);
+		ipc_answer_fast_0(rid, ENOMEM);
+		return;
+	}
 
 	/*
@@ -156,4 +166,5 @@
 		 * We already have the root FS.
 		 */
+		futex_down(&unlink_futex);
 		rc = vfs_lookup_internal((char *) (buf + FS_NAME_MAXLEN),
 		    size - FS_NAME_MAXLEN, &mp, NULL);
@@ -162,9 +173,26 @@
 			 * The lookup failed for some reason.
 			 */
-			futex_up(&rootfs_futex);
+			futex_up(&unlink_futex);
+			futex_up(&rootfs_futex);
+			vfs_node_put(mr_node);	/* failed -> drop reference */
 			free(buf);
 			ipc_answer_fast_0(rid, rc);
 			return;
 		}
+		mp_node = vfs_node_get(&mp);
+		if (!mp_node) {
+			futex_up(&unlink_futex);
+			futex_up(&rootfs_futex);
+			vfs_node_put(mr_node);	/* failed -> drop reference */
+			free(buf);
+			ipc_answer_fast_0(rid, ENOMEM);
+			return;
+		}
+		/*
+		 * Now we hold a reference to mp_node.
+		 * It will be dropped upon the corresponding VFS_UNMOUNT.
+		 * This prevents the mount point from being deleted.
+		 */
+		futex_up(&unlink_futex);
 	} else {
 		/*
@@ -188,4 +216,5 @@
 			futex_up(&rootfs_futex);
 			free(buf);
+			vfs_node_put(mr_node);	/* failed -> drop reference */
 			ipc_answer_fast_0(rid, ENOENT);
 			return;
@@ -218,4 +247,11 @@
 	vfs_release_phone(phone);
 
+	if ((rc1 != EOK) || (rc2 != EOK)) {
+		/* Mount failed, drop references to mr_node and mp_node. */
+		vfs_node_put(mr_node);
+		if (mp_node)
+			vfs_node_put(mp_node);
+	}
+	
 	if (rc2 == EOK)
 		ipc_answer_fast_0(rid, rc1);
Index: uspace/srv/vfs/vfs_unlink.c
===================================================================
--- uspace/srv/vfs/vfs_unlink.c	(revision b818cffb2cdbbb47bb911eb1870da1165d104a9f)
+++ uspace/srv/vfs/vfs_unlink.c	(revision 44358c12a5b7703b2d4a2693fb0d298ad39bdfaa)
@@ -40,6 +40,6 @@
 
 /**
- * This futex serializes concurrent VFS_CREATE, VFS_OPEN and VFS_UNLINK
- * operations.
+ * This futex prevents the race between a triplet-to-VFS-node resolution and a
+ * concurrent VFS_UNLINK or VFS_RMDIR operation.
  */
 atomic_t unlink_futex = FUTEX_INITIALIZER;