REQ_FSTATFS now operates on the root inode (the inode parameter has been

removed)

diff --git a/servers/mfs/stadir.c b/servers/mfs/stadir.c
index 720ee04608b20b2b8607d5b4e8e145c3ffeb245f..47221bdfd4cedf4db5db9d9879d29f63ba72257c 100644 (file)
--- a/servers/mfs/stadir.c
+++ b/servers/mfs/stadir.c
@@ -75,9 +75,8 @@ PUBLIC int fs_fstatfs()
   struct inode *rip;
   int r;
 
-  if ((rip = find_inode(fs_dev, fs_m_in.REQ_FD_INODE_NR))
-          == NIL_INODE) {
-      printf("FSfstatfs: couldn't find inode %d\n", fs_m_in.REQ_FD_INODE_NR);
+  if ((rip = find_inode(fs_dev, ROOT_INODE)) == NIL_INODE) {
+      printf("mfs:fstatfs: couldn't find inode %d\n", ROOT_INODE);
       return EINVAL;
   }
   

diff --git a/servers/vfs/proto.h b/servers/vfs/proto.h
index cba9fe87a571f51dd07bcabc52fa4fdadd9c4cc5..35c76719c0f9e633191feaaefeeacb77e9a163b6 100644 (file)
--- a/servers/vfs/proto.h
+++ b/servers/vfs/proto.h
@@ -151,8 +151,7 @@ _PROTOTYPE( int req_chown, (endpoint_t fs_e, ino_t inode_nr,
 _PROTOTYPE( int req_create, (int fs_e, ino_t inode_nr, int omode,
                int uid, int gid, char *path, node_details_t *res)      ); 
 _PROTOTYPE( int req_flush, (endpoint_t fs_e, Dev_t dev)                        );
-_PROTOTYPE( int req_fstatfs, (int fs_e, ino_t inode_nr, int who_e,
-                                                       char *buf)      );
+_PROTOTYPE( int req_fstatfs, (int fs_e, int who_e, char *buf)          );
 _PROTOTYPE( int req_ftrunc, (endpoint_t fs_e, ino_t inode_nr,
                                                off_t start, off_t end) );
 _PROTOTYPE( int req_getdents, (endpoint_t fs_e, ino_t inode_nr,

diff --git a/servers/vfs/request.c b/servers/vfs/request.c
index 4a7de724246ea41f88e8c798acf6b3b1d5053451..1e6fe452d96a06e2401411d7a4f88afa40749e2b 100644 (file)
--- a/servers/vfs/request.c
+++ b/servers/vfs/request.c
@@ -212,9 +212,8 @@ dev_t dev;
 /*===========================================================================*
  *                             req_fstatfs                                  *
  *===========================================================================*/
-PUBLIC int req_fstatfs(fs_e, inode_nr, who_e, buf)
+PUBLIC int req_fstatfs(fs_e, who_e, buf)
 int fs_e;
-ino_t inode_nr;
 int who_e;
 char *buf;
 {
@@ -229,7 +228,6 @@ char *buf;
 
   /* Fill in request message */
   m.m_type = REQ_FSTATFS;
-  m.REQ_INODE_NR = inode_nr;
   m.REQ_GRANT = gid;
 
   /* Send/rec request */

diff --git a/servers/vfs/stadir.c b/servers/vfs/stadir.c
index 90a66e678f81b805b3a70882ddecf3054dd78c39..975f4a333832c1d9ff6da89d13064f5fe7e79c1d 100644 (file)
--- a/servers/vfs/stadir.c
+++ b/servers/vfs/stadir.c
@@ -230,8 +230,7 @@ PUBLIC int do_fstatfs()
   if ( (rfilp = get_filp(m_in.fd)) == NIL_FILP) return(err_code);
 
   /* Issue request */
-  return req_fstatfs(rfilp->filp_vno->v_fs_e, rfilp->filp_vno->v_inode_nr,
-       who_e, m_in.buffer);
+  return req_fstatfs(rfilp->filp_vno->v_fs_e, who_e, m_in.buffer);
 }