diff options
| -rw-r--r-- | libmachdev/trivfs_server.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libmachdev/trivfs_server.c b/libmachdev/trivfs_server.c index 7d69a2ac..3c0578fa 100644 --- a/libmachdev/trivfs_server.c +++ b/libmachdev/trivfs_server.c @@ -19,10 +19,9 @@ int trivfs_support_write = 0; int trivfs_support_exec = 0; int trivfs_allow_open = O_READ | O_WRITE; -struct port_class *trivfs_protid_portclasses[1]; -struct port_class *trivfs_cntl_portclasses[1]; -int trivfs_protid_nportclasses = 1; -int trivfs_cntl_nportclasses = 1; +/* Our port classes. */ +struct port_class *trivfs_protid_class; +struct port_class *trivfs_cntl_class; /* Implementation of notify interface */ kern_return_t @@ -70,7 +69,7 @@ boolean_t is_master_device (mach_port_t port) { struct port_info *pi = ports_lookup_port (port_bucket, port, - trivfs_protid_portclasses[0]); + trivfs_protid_class); if (pi == NULL) return FALSE; @@ -96,8 +95,8 @@ trivfs_append_args (struct trivfs_control *fsys, char **argz, size_t *argz_len) int trivfs_init() { port_bucket = ports_create_bucket (); - trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0); - trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0); + trivfs_cntl_class = ports_create_class (trivfs_clean_cntl, 0); + trivfs_protid_class = ports_create_class (trivfs_clean_protid, 0); return 0; } @@ -107,17 +106,17 @@ trivfs_goaway (struct trivfs_control *fsys, int flags) int count; /* Stop new requests. */ - ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]); - ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]); + ports_inhibit_class_rpcs (trivfs_cntl_class); + ports_inhibit_class_rpcs (trivfs_protid_class); - count = ports_count_class (trivfs_protid_portclasses[0]); + count = ports_count_class (trivfs_protid_class); if (count && !(flags & FSYS_GOAWAY_FORCE)) { /* We won't go away, so start things going again... */ - ports_enable_class (trivfs_protid_portclasses[0]); - ports_resume_class_rpcs (trivfs_cntl_portclasses[0]); - ports_resume_class_rpcs (trivfs_protid_portclasses[0]); + ports_enable_class (trivfs_protid_class); + ports_resume_class_rpcs (trivfs_cntl_class); + ports_resume_class_rpcs (trivfs_protid_class); return EBUSY; } @@ -158,8 +157,8 @@ void trivfs_server() /* Reply to our parent. */ err = trivfs_startup (bootstrap, 0, - trivfs_cntl_portclasses[0], port_bucket, - trivfs_protid_portclasses[0], port_bucket, &fsys); + trivfs_cntl_class, port_bucket, + trivfs_protid_class, port_bucket, &fsys); mach_port_deallocate (mach_task_self (), bootstrap); if (err) error (1, err, "Contacting parent"); |