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/trans-callback.c | |
| parent | 5c086e129802f8a5705a7b866b877c37cb88d29b (diff) | |
| download | hurd-22702db6dab56e36c86d91fbf5f2f469fad99f2c.tar.gz hurd-22702db6dab56e36c86d91fbf5f2f469fad99f2c.tar.bz2 hurd-22702db6dab56e36c86d91fbf5f2f469fad99f2c.zip | |
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/trans-callback.c')
| -rw-r--r-- | libdiskfs/trans-callback.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libdiskfs/trans-callback.c b/libdiskfs/trans-callback.c index 73d551c3..0a0bc450 100644 --- a/libdiskfs/trans-callback.c +++ b/libdiskfs/trans-callback.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1995,96,97,98,2001 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,2001,02 Free Software Foundation, Inc. Written by Michael I. Bushnell. This file is part of the GNU Hurd. @@ -54,6 +54,7 @@ _diskfs_translator_callback2_fn (void *cookie1, void *cookie2, { struct node *np = cookie1; struct protid *cred; + struct peropen *po; error_t err; struct iouser *user; @@ -62,11 +63,16 @@ _diskfs_translator_callback2_fn (void *cookie1, void *cookie2, if (err) return err; - err = - diskfs_create_protid (diskfs_make_peropen (np, flags, cookie2), - user, &cred); + err = diskfs_make_peropen (np, flags, cookie2, &po); + if (! err) + { + err = diskfs_create_protid (po, user, &cred); + if (err) + diskfs_release_peropen (po); + } iohelp_free_iouser (user); + if (! err) { *underlying = ports_get_right (cred); |