diff options
| author | Neal H. Walfield <neal@gnu.org> | 2002-03-26 14:59:52 +0000 |
|---|---|---|
| committer | Neal H. Walfield <neal@gnu.org> | 2002-03-26 14:59:52 +0000 |
| commit | 22702db6dab56e36c86d91fbf5f2f469fad99f2c (patch) | |
| tree | 2e887617a1cac327c98cf9329bcf10e0ba1d2b9e /libdiskfs/init-startup.c | |
| parent | 5c086e129802f8a5705a7b866b877c37cb88d29b (diff) | |
2002-03-25 Neal H Walfield <neal@cs.uml.edu>
* peropen-make.c (diskfs_make_peropen): Instead of returning the
peropen, return as error_t and return the peropen in the new
parameter *PPO.
* diskfs.h (diskfs_make_peropen): Change declaration to reflect
new semantics.
* boot-start.c (diskfs_start_bootstrap): Check the return value of
diskfs_make_peropen using the new semantics.
(diskfs_S_exec_startup_get_info): Likewise.
(diskfs_execboot_fsys_startup): Likewise.
(diskfs_S_fsys_init): Likewise.
* dir-lookup.c (diskfs_S_dir_lookup): Likewise.
* dir-mkfile.c (diskfs_S_dir_mkfile): Likewise.
* file-exec.c (diskfs_S_file_exec): Likewise.
* file-reparent.c (diskfs_S_file_reparent): Likewise.
* fsys-getfile.c (diskfs_S_fsys_getfile): Likewise.
* fsys-getroot.c (diskfs_S_fsys_getroot): Likewise.
* trans-callback.c (_diskfs_translator_callback2_fn): Likewise.
* init-startup.c (diskfs_startup_diskfs): Likewise.
Diffstat (limited to 'libdiskfs/init-startup.c')
| -rw-r--r-- | libdiskfs/init-startup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c index bdf0e9b9..cf922bd3 100644 --- a/libdiskfs/init-startup.c +++ b/libdiskfs/init-startup.c @@ -1,5 +1,5 @@ /* diskfs_startup_diskfs -- advertise our fsys control port to our parent FS. - Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000 Free Software Foundation + Copyright (C) 1994,95,96,98,99,2000,02 Free Software Foundation This file is part of the GNU Hurd. @@ -42,6 +42,7 @@ diskfs_startup_diskfs (mach_port_t bootstrap, int flags) and treat that as the root of the filesystem. */ struct node *np, *old; struct protid *rootpi; + struct peropen *rootpo; /* Skip leading slashes. */ while (*_diskfs_chroot_directory == '/') @@ -50,9 +51,10 @@ diskfs_startup_diskfs (mach_port_t bootstrap, int flags) mutex_lock (&diskfs_root_node->lock); /* Create a protid we can use in diskfs_lookup. */ - err = diskfs_create_protid (diskfs_make_peropen (diskfs_root_node, - O_READ|O_EXEC, 0), - 0, &rootpi); + err = diskfs_make_peropen (diskfs_root_node, O_READ|O_EXEC, + 0, &rootpo); + assert_perror (err); + err = diskfs_create_protid (rootpo, 0, &rootpi); assert_perror (err); /* Look up the directory name. */ |