hurd: fix the get-children and get-source procedures

* hurd/fs.defs: Add file_get_children and file_get_source.
* hurd/fsys.defs: Remove fsys_get_children and fsys_get_source.
* libdiskfs/fsys-get-children.c: Rename and adapt accordingly.
* libdiskfs/fsys-get-source.c: Likewise.
* libnetfs/fsys-get-children.c: Likewise.
* libnetfs/fsys-get-source.c: Likewise.
* libtrivfs/fsys-get-children.c: Likewise.
* libtrivfs/fsys-get-source.c: Likewise.
* libdiskfs/diskfs.h: Adapt prototype and comment.
* libnetfs/netfs.h: Likewise.
* libtrivfs/trivfs.h: Likewise.
* libdiskfs/get-source.c: Adapt default implementation, provide
diskfs_disk_name by default.
* libnetfs/netfs.h: Adapt default implementation.
* libtrivfs/get-source.c: Likewise.
* libdiskfs/Makefile: Adapt accordingly.
* libnetfs/Makefile: Likewise.
* libtrivfs/Makefile: Likewise.
* trans/symlink.c: Likewise.
* trans/mtab.c: Likewise.

5 files changed, 12 insertions, 11 deletions

diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile
index 241b76df..3e4c0393 100644
--- a/libtrivfs/Makefile
+++ b/libtrivfs/Makefile
@@ -35,7 +35,7 @@ IOSRCS=io-async-icky.c io-async.c io-duplicate.c io-map.c io-modes-get.c \
 
 FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-stubs.c fsys-syncfs.c \
 	fsys-forward.c fsys-set-options.c fsys-get-options.c \
-	fsys-get-children.c fsys-get-source.c
+	file-get-children.c file-get-source.c
 
 OTHERSRCS=demuxer.c protid-clean.c protid-dup.c cntl-create.c \
 	cntl-clean.c migsupport.c times.c startup.c open.c \
diff --git a/libtrivfs/fsys-get-children.c b/libtrivfs/file-get-children.c
index 4697cc5d..a3afbba2 100644
--- a/libtrivfs/fsys-get-children.c
+++ b/libtrivfs/file-get-children.c
@@ -1,4 +1,4 @@
-/* fsys_get_children
+/* file_get_children
 
    Copyright (C) 2013 Free Software Foundation, Inc.
 
@@ -25,7 +25,7 @@
    filesystem.  CHILDREN is an argz vector containing file names
    relative to the root of the receiving translator.  */
 error_t
-trivfs_S_fsys_get_children (trivfs_control_t server,
+trivfs_S_file_get_children (struct trivfs_protid *cred,
 			    mach_port_t reply,
 			    mach_msg_type_name_t replyPoly,
 			    char **children,
diff --git a/libtrivfs/fsys-get-source.c b/libtrivfs/file-get-source.c
index 64aec2fb..35636b56 100644
--- a/libtrivfs/fsys-get-source.c
+++ b/libtrivfs/file-get-source.c
@@ -1,4 +1,4 @@
-/* fsys_get_source
+/* file_get_source
 
    Copyright (C) 2013 Free Software Foundation, Inc.
 
@@ -24,10 +24,10 @@
 /* Return information about the source of the receiving
    filesystem.	*/
 error_t
-trivfs_S_fsys_get_source (trivfs_control_t server,
+trivfs_S_file_get_source (struct trivfs_protid *cred,
 			  mach_port_t reply,
 			  mach_msg_type_name_t replyPoly,
 			  char *source)
 {
-  return trivfs_get_source (source);
+  return cred? trivfs_get_source (cred, source, 1024 /* XXX */): EOPNOTSUPP;
 }
diff --git a/libtrivfs/get-source.c b/libtrivfs/get-source.c
index 9ea56930..2605dacc 100644
--- a/libtrivfs/get-source.c
+++ b/libtrivfs/get-source.c
@@ -22,7 +22,7 @@
 #include "priv.h"
 
 error_t
-trivfs_get_source (char *source)
+trivfs_get_source (struct trivfs_protid *cred, char *source, size_t source_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
index cf817b50..306a4302 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -235,10 +235,11 @@ error_t trivfs_append_args (struct trivfs_control *fsys,
 			    char **argz, size_t *argz_len);
 
 /* The user may define this function.  The function must set source to
-   the source device of the filesystem. The function may return an
-   EOPNOTSUPP to indicate that the concept of a source device is not
-   applicable. The default function always returns EOPNOTSUPP. */
-error_t trivfs_get_source (char *source);
+   the source device of CRED. The function may return an EOPNOTSUPP to
+   indicate that the concept of a source device is not applicable. The
+   default function always returns EOPNOTSUPP. */
+error_t trivfs_get_source (struct trivfs_protid *cred,
+                           char *source, size_t source_len);
 
 /* Add the port class *CLASS to the list of control port classes recognized
    by trivfs; if *CLASS is 0, an attempt is made to allocate a new port