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/dir-lookup.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/dir-lookup.c')
| -rw-r--r-- | libdiskfs/dir-lookup.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index fe68251e..1d5f58c0 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -1,5 +1,5 @@ /* libdiskfs implementation of fs.defs:dir_lookup - Copyright (C) 1992,93,94,95,96,97,98,99,2000,01 + Copyright (C) 1992,93,94,95,96,97,98,99,2000,01,02 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or @@ -54,6 +54,7 @@ diskfs_S_dir_lookup (struct protid *dircred, int amt; int type; struct protid *newpi; + struct peropen *newpo; if (!dircred) return EOPNOTSUPP; @@ -252,10 +253,14 @@ diskfs_S_dir_lookup (struct protid *dircred, error = iohelp_create_empty_iouser (&user); if (! error) { - error = - diskfs_create_protid (diskfs_make_peropen (dnp, 0, - dircred->po), - user, &newpi); + error = diskfs_make_peropen (dnp, 0, dircred->po, &newpo); + if (! error) + { + error = diskfs_create_protid (newpo, user, &newpi); + if (error) + diskfs_release_peropen (newpo); + } + iohelp_free_iouser (user); } @@ -451,11 +456,15 @@ diskfs_S_dir_lookup (struct protid *dircred, && (fshelp_isowner (&np->dn_stat, dircred->user) == EPERM)) flags &= ~O_NOATIME; - error = - diskfs_create_protid (diskfs_make_peropen (np, - (flags &~OPENONLY_STATE_MODES), - dircred->po), - dircred->user, &newpi); + error = diskfs_make_peropen (np, (flags &~OPENONLY_STATE_MODES), + dircred->po, &newpo); + + if (! error) + { + error = diskfs_create_protid (newpo, dircred->user, &newpi); + if (error) + diskfs_release_peropen (newpo); + } if (! error) { |