Unify and document the way fsids are handled in trivfs translators

* doc/hurd.texi: Clarify what happens if 'trivfs_fsid' is zero.
* login/utmp.c: Leave 'trivfs_fsid' at zero.
* pfinet/main.c: Likewise.
* trans/ifsock.c: Likewise.
* trans/proxy-defpager.c: Likewise.

5 files changed, 5 insertions, 6 deletions

diff --git a/doc/hurd.texi b/doc/hurd.texi
index 525bfa78..2bcf561b 100644
--- a/doc/hurd.texi
+++ b/doc/hurd.texi
@@ -2284,7 +2284,9 @@ and functions:
 @deftypevarx {extern int} trivfs_fsid
 These variables are returned in the @var{st_fstype} and @var{st_fsid}
 fields of @code{struct stat}.  @var{trivfs_fstype} should be chosen
-from the @code{FSTYPE_*} constants found in @code{<hurd/hurd_types.h>}.
+from the @code{FSTYPE_*} constants found in
+@code{<hurd/hurd_types.h>}.  If @code{trivfs_fsid} is zero, trivfs
+will use the pid of the translator instead.
 @end deftypevar
 
 @deftypevar {extern int} trivfs_allow_open
diff --git a/login/utmp.c b/login/utmp.c
index c7c1ac04..f366d44b 100644
--- a/login/utmp.c
+++ b/login/utmp.c
@@ -364,7 +364,7 @@ S_login_get_login_collection(file_t utmp, int *pid)
 #define PT_PROC 2		/* Our process handle. */
 
 int trivfs_fstype = FSTYPE_MISC;
-int trivfs_fsid = 0; /* ??? */
+int trivfs_fsid = 0;
 
 int trivfs_support_read = 0;
 int trivfs_support_write = 0;
diff --git a/pfinet/main.c b/pfinet/main.c
index 4bfa3185..5e4b7494 100644
--- a/pfinet/main.c
+++ b/pfinet/main.c
@@ -283,7 +283,6 @@ main (int argc,
   pfinet_bucket = ports_create_bucket ();
   addrport_class = ports_create_class (clean_addrport, 0);
   socketport_class = ports_create_class (clean_socketport, 0);
-  trivfs_fsid = getpid ();
   mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
 		      &fsys_identity);
 
diff --git a/trans/ifsock.c b/trans/ifsock.c
index 13a21338..908fe135 100644
--- a/trans/ifsock.c
+++ b/trans/ifsock.c
@@ -51,7 +51,7 @@ struct port_class *node_class;
 struct port_bucket *port_bucket;
 
 int trivfs_fstype = FSTYPE_IFSOCK;
-int trivfs_fsid = 0; /* ??? */
+int trivfs_fsid = 0;
 
 int trivfs_support_read = 0;
 int trivfs_support_write = 0;
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 9a8436ae..e2b15ea8 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -286,8 +286,6 @@ main (int argc, char **argv)
   if (bootstrap == MACH_PORT_NULL)
     error (1, 0, "Must be started as a translator");
 
-  trivfs_fsid = getpid ();
-
   err = trivfs_add_protid_port_class (&trivfs_protid_class);
   if (err)
     error (1, 0, "error creating protid port class");