diff options
author | Justus Winter <justus@gnupg.org> | 2017-08-29 23:35:55 +0200 |
---|---|---|
committer | Justus Winter <justus@gnupg.org> | 2017-09-12 11:32:29 +0200 |
commit | 86ecc3fc9aa88091ac77ec35688d08634567d169 (patch) | |
tree | 44dfc7818e0523fe4db3069ae9bbc7fe993f48d0 /hurd/fs.defs | |
parent | e08859424e01697fe556e277283e8e1905327ce7 (diff) |
Traverse translator hierarchies using the fsys protocol.
Previously, we used the fs protocol to traverse the translator
hierarchies. This, however, is conceptually flawed, because
translators are bound to nodes, and a node can have zero or more links
in the file system. Therefore, the previous method of returning a
list of paths to the client and expecting them to be able to follow
these to reach the child translators was always unreliable.
Fix this by using the fsys protocol to traverse the hierarchy, and
returning the control ports of all children. This is more robust, and
also conceptually cleaner, because the fsys protocol is about
translator linkage, hence this is the point to implement traversal.
Also move the get source routine over. A per-node source really
does not fit the reality of most translators, while a per-translator
source makes sense in many cases.
* hurd/fs.defs (file_get_children): Drop routine.
(file_get_source): Likewise.
* hurd/fsys.defs (fsys_get_children): New routine.
(fsys_get_source): Likewise.
* libdiskfs/Makefile (FSYSSRCS): Remove files, add files.
* libdiskfs/file-get-children.c: Remove file.
* libdiskfs/fsys-get-children.c: New file.
* libdiskfs/file-get-source.c: Remove file.
* libdiskfs/fsys-get-source.c: New file.
* libfshelp/fshelp.h (fshelp_filter): Remove type.
(fshelp_get_active_translators): Remove filter and prefix argument,
return list of control ports.
* libfshelp/translator-list.c (fshelp_get_active_translators):
Likewise.
* libnetfs/Makefile (FSSRCS): Move 'get-source.c' too OTHERSRCS.
(FSYSSRCS): Remove files, add files.
* libnetfs/file-get-children.c: Remove file.
* libnetfs/fsys-get-children.c: New file.
* libnetfs/file-get-source.c: Remove file.
* libnetfs/fsys-get-source.c: New file.
* libtrivfs/Makefile: Move 'get-source.c' too OTHERSRCS.
(FSYSSRCS): Remove files, add files.
* libtrivfs/file-get-children.c: Remove file.
* libtrivfs/fsys-get-children.c: New file.
* libtrivfs/file-get-source.c: Remove file.
* libtrivfs/fsys-get-source.c: Add file.
* trans/Makefile (mtab): Build client stubs until the libc has caught
on.
* trans/mtab.c (target_control): New variable.
(insecure): Drop variable.
(all_translators): Likewise.
(MAX_DEPTH): New macro.
(max_depth): New variable.
(options): Remove '--insecure' and '--all-translators', add '--depth'.
(parse_opt): Adapt accordingly.
(trivsfs_append_args): Likewise.
(main): Get the control port of the target translator, then drop
privileges.
(is_filesystem_translator): Remove function.
(mtab_mark_as_seen): Simplify. Just check if the control port is
known.
(mtab_populate): Limit depth of recursion, adapt to traversing over
the control ports, simplify.
(open_hook): Remove scary comment, it is not applicable anymore
because we no longer dir_lookup child translators.
Diffstat (limited to 'hurd/fs.defs')
-rw-r--r-- | hurd/fs.defs | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/hurd/fs.defs b/hurd/fs.defs index a4a48cc8..6c0b5731 100644 --- a/hurd/fs.defs +++ b/hurd/fs.defs @@ -353,21 +353,5 @@ routine file_reparent ( parent: mach_port_t; out new_file: mach_port_send_t); -/* Return any active translators bound to nodes below FILE. CHILDREN - is an argz vector containing file names relative to the path of - FILE. */ -routine file_get_children ( - file: file_t; - RPT - out children: data_t); - -/* Return information about the source of FILE. If the concept of a - source is applicable, SOURCE should refer to the source of FILE and - should be a description considered appropriate in the context of - the translator. For example, if FILE refers to a node on a - filesystems, SOURCE should be the file name of the underlying block - device. */ -routine file_get_source ( - file: file_t; - RPT - out source: string_t); +skip; /* Was: file_get_children. */ +skip; /* Was: file_get_source. */ |