Actually rename FDESC, PORTAL, UMAP and UNION file systems.

OK'ed by:	bp

8 files changed, 24 insertions, 24 deletions

diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index db57fec..4657be3 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -175,12 +175,12 @@ main(argc, argv)
 	sprintf(tag, "portal:%d", getpid());
 	args.pa_config = tag;
 
-	error = getvfsbyname("portal", &vfc);
-	if (error && vfsisloadable("portal")) {
-		if (vfsload("portal"))
-			err(EX_OSERR, "vfsload(portal)");
+	error = getvfsbyname("portalfs", &vfc);
+	if (error && vfsisloadable("portalfs")) {
+		if (vfsload("portalfs"))
+			err(EX_OSERR, "vfsload(portalfs)");
 		endvfsent();
-		error = getvfsbyname("portal", &vfc);
+		error = getvfsbyname("portalfs", &vfc);
 	}
 	if (error)
 		errx(EX_OSERR, "portal filesystem is not available");
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 19817ca..88f1d5d 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -226,12 +226,12 @@ main(argc, argv)
 	args.gnentries = gnentries;
 	args.gmapdata = gmapdata;
 
-	error = getvfsbyname("umap", &vfc);
-	if (error && vfsisloadable("umap")) {
-		if(vfsload("umap"))
-			err(1, "vfsload(umap)");
+	error = getvfsbyname("umapfs", &vfc);
+	if (error && vfsisloadable("umapfs")) {
+		if(vfsload("umapfs"))
+			err(1, "vfsload(umapfs)");
 		endvfsent();
-		error = getvfsbyname("umap", &vfc);
+		error = getvfsbyname("umapfs", &vfc);
 	}
 	if (error)
 		errx(1, "umap filesystem is not available");
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index cc2785b..d412626 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -119,12 +119,12 @@ main(argc, argv)
 
 	args.target = target;
 
-	error = getvfsbyname("union", &vfc);
-	if (error && vfsisloadable("union")) {
-		if (vfsload("union"))
-			err(EX_OSERR, "vfsload(union)");
+	error = getvfsbyname("unionfs", &vfc);
+	if (error && vfsisloadable("unionfs")) {
+		if (vfsload("unionfs"))
+			err(EX_OSERR, "vfsload(unionfs)");
 		endvfsent();	/* flush cache */
-		error = getvfsbyname("union", &vfc);
+		error = getvfsbyname("unionfs", &vfc);
 	}
 	if (error)
 		errx(EX_OSERR, "union filesystem is not available");
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 1bb1f71..ed16306 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -223,4 +223,4 @@ static struct vfsops fdesc_vfsops = {
 	vfs_stdextattrctl,
 };
 
-VFS_SET(fdesc_vfsops, fdesc, VFCF_SYNTHETIC);
+VFS_SET(fdesc_vfsops, fdescfs, VFCF_SYNTHETIC);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 7178599..5c47e72 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -254,4 +254,4 @@ static struct vfsops portal_vfsops = {
 	vfs_stdextattrctl,
 };
 
-VFS_SET(portal_vfsops, portal, VFCF_SYNTHETIC);
+VFS_SET(portal_vfsops, portalfs, VFCF_SYNTHETIC);
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index f967272..6e01f3d 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -451,4 +451,4 @@ static struct vfsops umap_vfsops = {
 	umapfs_extattrctl,
 };
 
-VFS_SET(umap_vfsops, umap, VFCF_LOOPBACK);
+VFS_SET(umap_vfsops, umapfs, VFCF_LOOPBACK);
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 5a5af5d..1a5cb70 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -482,4 +482,4 @@ static struct vfsops union_vfsops = {
 	vfs_stdextattrctl,
 };
 
-VFS_SET(union_vfsops, union, VFCF_LOOPBACK);
+VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK);
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index db57fec..4657be3 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -175,12 +175,12 @@ main(argc, argv)
 	sprintf(tag, "portal:%d", getpid());
 	args.pa_config = tag;
 
-	error = getvfsbyname("portal", &vfc);
-	if (error && vfsisloadable("portal")) {
-		if (vfsload("portal"))
-			err(EX_OSERR, "vfsload(portal)");
+	error = getvfsbyname("portalfs", &vfc);
+	if (error && vfsisloadable("portalfs")) {
+		if (vfsload("portalfs"))
+			err(EX_OSERR, "vfsload(portalfs)");
 		endvfsent();
-		error = getvfsbyname("portal", &vfc);
+		error = getvfsbyname("portalfs", &vfc);
 	}
 	if (error)
 		errx(EX_OSERR, "portal filesystem is not available");