Actually rename FDESC, PORTAL, UMAP and UNION file systems.
OK'ed by: bp
This commit is contained in:
parent
4c3748cf1d
commit
c7b23e0fb4
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user