libfsdriver: prefill st_dev for stat requests

This obviates the need for several file system implementations to
remember the device on which they are mounted.

Change-Id: Ida8325cf4bcf072e61761cfee34e3f7ed2d750b9

diff --git a/lib/libpuffs/glo.h b/lib/libpuffs/glo.h
index 6e4645216441884d222d3e6a572368a1b6e6fea7..bc39b8120f2953687c6804e66b01863ba5788338 100644 (file)
--- a/lib/libpuffs/glo.h
+++ b/lib/libpuffs/glo.h
@@ -25,8 +25,6 @@ EXTERN int err_code;        /* temporary storage for error number */
 
 EXTERN struct puffs_kcred global_kcred;
 
-EXTERN dev_t fs_dev;              /* The device that is handled by this FS proc
-                                   */
 EXTERN char fs_name[PATH_MAX+1];
 
 EXTERN int mounted;

diff --git a/lib/libpuffs/inode.c b/lib/libpuffs/inode.c
index e62149dc783532eacba111efde64a877604b2a2c..50a6ad4fd478df278954f52d42c1082b679c7e5a 100644 (file)
--- a/lib/libpuffs/inode.c
+++ b/lib/libpuffs/inode.c
@@ -52,8 +52,8 @@ int fs_putnode(ino_t ino_nr, unsigned int count)
   }
 
   if (pn == NULL) {
-       lpuffs_debug("%s:%d putnode: pnode #%"PRIu64" dev: %"PRIu64
-               " not found\n", __FILE__, __LINE__, ino_nr, fs_dev);
+       lpuffs_debug("%s:%d putnode: pnode #%"PRIu64" not found\n",
+           __FILE__, __LINE__, ino_nr);
        panic("fs_putnode failed");
   }
 

diff --git a/lib/libpuffs/mount.c b/lib/libpuffs/mount.c
index 05272e9f8e844ea889da3c88149d07899e913ba7..237744e150aff1c3d0e34852127bef58a5e0c9c5 100644 (file)
--- a/lib/libpuffs/mount.c
+++ b/lib/libpuffs/mount.c
@@ -12,12 +12,11 @@
 /*===========================================================================*
  *                             fs_mount                                     *
  *===========================================================================*/
-int fs_mount(dev_t dev, unsigned int flags, struct fsdriver_node *root_node,
-       unsigned int *res_flags)
+int fs_mount(dev_t __unused dev, unsigned int flags,
+       struct fsdriver_node *root_node, unsigned int *res_flags)
 {
   struct vattr *root_va;
 
-  fs_dev = dev;
   is_readonly_fs = !!(flags & REQ_RDONLY);
 
   /* Open root pnode */

diff --git a/lib/libpuffs/stadir.c b/lib/libpuffs/stadir.c
index a5be843bb1e5969d9aa12fc35c894b431722b84e..6d1d14d07e9d5c20b1ff8d005d70cb7e28405d4d 100644 (file)
--- a/lib/libpuffs/stadir.c
+++ b/lib/libpuffs/stadir.c
@@ -45,7 +45,6 @@ int fs_stat(ino_t ino_nr, struct stat *statbuf)
   /* true iff special */
   s = (mo == I_CHAR_SPECIAL || mo == I_BLOCK_SPECIAL);
 
-  statbuf->st_dev = fs_dev;
   statbuf->st_ino = va.va_fileid;
   statbuf->st_mode = va.va_mode;
   statbuf->st_nlink = va.va_nlink;

diff --git a/minix/lib/libfsdriver/call.c b/minix/lib/libfsdriver/call.c
index 8ebda1c291aa9e9bf0e729156112a7d303b2b8c0..cb40015b6e86b4f4f13b13e9d50b5d0cf0f8d5cd 100644 (file)
--- a/minix/lib/libfsdriver/call.c
+++ b/minix/lib/libfsdriver/call.c
@@ -55,6 +55,7 @@ fsdriver_readsuper(const struct fsdriver * __restrict fdp,
 
                /* Update library-local state. */
                fsdriver_mounted = TRUE;
+               fsdriver_device = dev;
                fsdriver_root = root_node.fn_ino_nr;
        }
 
@@ -654,6 +655,7 @@ fsdriver_stat(const struct fsdriver * __restrict fdp,
                return ENOSYS;
 
        memset(&buf, 0, sizeof(buf));
+       buf.st_dev = fsdriver_device;
 
        if ((r = fdp->fdr_stat(ino_nr, &buf)) == OK)
                r = sys_safecopyto(m_in->m_source, grant, 0, (vir_bytes)&buf,

diff --git a/minix/lib/libfsdriver/fsdriver.c b/minix/lib/libfsdriver/fsdriver.c
index 145ac54664b55d999a4a52679d52eb55f03c0e40..1443e9ff70b8b44d56402fa64f11bbd244c00bb4 100644 (file)
--- a/minix/lib/libfsdriver/fsdriver.c
+++ b/minix/lib/libfsdriver/fsdriver.c
@@ -2,6 +2,7 @@
 #include "fsdriver.h"
 
 /* Library-local variables. */
+dev_t fsdriver_device;
 ino_t fsdriver_root;
 int fsdriver_mounted = FALSE;
 

diff --git a/minix/lib/libfsdriver/fsdriver.h b/minix/lib/libfsdriver/fsdriver.h
index 7c83f7b7522238e5af689592ac6ec30dd51139d8..65a6ba512c968262a11d6cab2db8ee0cd93ba348 100644 (file)
--- a/minix/lib/libfsdriver/fsdriver.h
+++ b/minix/lib/libfsdriver/fsdriver.h
@@ -75,6 +75,7 @@ extern int fsdriver_bpeek(const struct fsdriver * __restrict,
 extern int fsdriver_getname(endpoint_t endpt, cp_grant_id_t grant, size_t len,
        char *name, size_t size, int not_empty);
 
+extern dev_t fsdriver_device;
 extern ino_t fsdriver_root;
 extern int fsdriver_mounted;
 extern int (*fsdriver_callvec[])(const struct fsdriver * __restrict,

diff --git a/minix/lib/libsffs/glo.h b/minix/lib/libsffs/glo.h
index 2ec5e942ca069e248be8fc24d57242f8f7a74aaf..485004b8423b63e852df855a6d8007642e249744 100644 (file)
--- a/minix/lib/libsffs/glo.h
+++ b/minix/lib/libsffs/glo.h
@@ -10,7 +10,7 @@ EXTERN char *sffs_name;                               /* file server name */
 EXTERN const struct sffs_table *sffs_table;    /* call table */
 EXTERN struct sffs_params *sffs_params;                /* parameters */
 
-EXTERN struct state state;                     /* global state */
+EXTERN int read_only;                          /* mounted read-only? */
 
 extern struct fsdriver sffs_dtable;            /* driver table */
 

diff --git a/minix/lib/libsffs/handle.c b/minix/lib/libsffs/handle.c
index ed416c1343660cce89f69172f4827cbe728d12df..b346175c0de9984fa6cbd9678bc9ba54f07ece18 100644 (file)
--- a/minix/lib/libsffs/handle.c
+++ b/minix/lib/libsffs/handle.c
@@ -33,13 +33,13 @@ int get_handle(struct inode *ino)
        r = sffs_table->t_opendir(path, &ino->i_dir);
   }
   else {
-       if (!state.s_read_only)
+       if (!read_only)
                r = sffs_table->t_open(path, O_RDWR, 0, &ino->i_file);
 
        /* Protection or mount status might prevent us from writing. With the
         * information that we have available, this is the best we can do..
         */
-       if (state.s_read_only || r != OK)
+       if (read_only || r != OK)
                r = sffs_table->t_open(path, O_RDONLY, 0, &ino->i_file);
   }
 

diff --git a/minix/lib/libsffs/inc.h b/minix/lib/libsffs/inc.h
index 61d537f0865bc66fc7a6bf798c9a0e462935baa9..d04f36f4e6211281552e13ac2d27631ecb88dbf8 100644 (file)
--- a/minix/lib/libsffs/inc.h
+++ b/minix/lib/libsffs/inc.h
@@ -16,7 +16,6 @@
 #define dprintf(x)
 #endif
 
-#include "type.h"
 #include "const.h"
 #include "proto.h"
 #include "glo.h"

diff --git a/minix/lib/libsffs/link.c b/minix/lib/libsffs/link.c
index e1a01ad925128cb52ca351cc931c1f1e30912bb5..c55466e084d1b90bb36281c50ffaa1ae26f49382 100644 (file)
--- a/minix/lib/libsffs/link.c
+++ b/minix/lib/libsffs/link.c
@@ -30,7 +30,7 @@ int do_create(ino_t dir_nr, char *name, mode_t mode, uid_t uid, gid_t gid,
   int r;
 
   /* We cannot create files on a read-only file system. */
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((parent = find_inode(dir_nr)) == NULL)
@@ -129,7 +129,7 @@ int do_mkdir(ino_t dir_nr, char *name, mode_t mode, uid_t uid, gid_t gid)
   int r;
 
   /* We cannot create directories on a read-only file system. */
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((parent = find_inode(dir_nr)) == NULL)
@@ -228,7 +228,7 @@ int do_unlink(ino_t dir_nr, char *name, int call)
   int r;
 
   /* We cannot delete files on a read-only file system. */
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((parent = find_inode(dir_nr)) == NULL)
@@ -269,7 +269,7 @@ int do_rmdir(ino_t dir_nr, char *name, int call)
   int r;
 
   /* We cannot remove directories on a read-only file system. */
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((parent = find_inode(dir_nr)) == NULL)
@@ -312,7 +312,7 @@ int do_rename(ino_t old_dir_nr, char *old_name, ino_t new_dir_nr,
   int r;
 
   /* We cannot do rename on a read-only file system. */
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   /* Get possibly preexisting inodes for the old and new paths. */

diff --git a/minix/lib/libsffs/mount.c b/minix/lib/libsffs/mount.c
index a8d1a41ec232d7363a4f4a402378a63b1b264548..998e0151f01b5fb2dde789624b35d3dfadb66635 100644 (file)
--- a/minix/lib/libsffs/mount.c
+++ b/minix/lib/libsffs/mount.c
@@ -13,8 +13,8 @@
 /*===========================================================================*
  *                             do_mount                                     *
  *===========================================================================*/
-int do_mount(dev_t dev, unsigned int flags, struct fsdriver_node *root_node,
-       unsigned int *res_flags)
+int do_mount(dev_t __unused dev, unsigned int flags,
+       struct fsdriver_node *root_node, unsigned int *res_flags)
 {
 /* Mount the file system.
  */
@@ -31,8 +31,7 @@ int do_mount(dev_t dev, unsigned int flags, struct fsdriver_node *root_node,
        return EINVAL;
   }
 
-  state.s_read_only = !!(flags & REQ_RDONLY);
-  state.s_dev = dev;
+  read_only = !!(flags & REQ_RDONLY);
 
   init_dentry();
   ino = init_inode();

diff --git a/minix/lib/libsffs/stat.c b/minix/lib/libsffs/stat.c
index bd9902b3062596399950c17d4709197ea1ed245d..330afbf086776eb47a76c1a7404c00fd10506a0a 100644 (file)
--- a/minix/lib/libsffs/stat.c
+++ b/minix/lib/libsffs/stat.c
@@ -28,7 +28,7 @@ mode_t get_mode(struct inode *ino, int mode)
   else
        mode = S_IFREG | (mode & sffs_params->p_file_mask);
 
-  if (state.s_read_only)
+  if (read_only)
        mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
 
   return mode;
@@ -56,7 +56,6 @@ int do_stat(ino_t ino_nr, struct stat *stat)
   if ((r = verify_inode(ino, path, &attr)) != OK)
        return r;
 
-  stat->st_dev = state.s_dev;
   stat->st_ino = ino_nr;
   stat->st_mode = get_mode(ino, attr.a_mode);
   stat->st_uid = sffs_params->p_uid;
@@ -100,7 +99,7 @@ int do_chmod(ino_t ino_nr, mode_t *mode)
   struct sffs_attr attr;
   int r;
 
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((ino = find_inode(ino_nr)) == NULL)
@@ -137,7 +136,7 @@ int do_utime(ino_t ino_nr, struct timespec *atime, struct timespec *mtime)
   struct sffs_attr attr;
   int r;
 
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((ino = find_inode(ino_nr)) == NULL)

diff --git a/minix/lib/libsffs/type.h b/minix/lib/libsffs/type.h
deleted file mode 100644 (file)
index b4d7054..0000000
--- a/minix/lib/libsffs/type.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _SFFS_TYPE_H
-#define _SFFS_TYPE_H
-
-/* Structure with global file system state. */
-struct state {
-  int s_read_only;             /* is the file system mounted read-only? note,
-                                * has no relation to the shared folder mode */
-  dev_t s_dev;                 /* device the file system is mounted on */
-};
-
-#endif /* _SFFS_TYPE_H */

diff --git a/minix/lib/libsffs/write.c b/minix/lib/libsffs/write.c
index 711c26f41df46627fad7006bc76b088f4c9dec21..d18a5831add5b58b217c0a654142507c11c741cf 100644 (file)
--- a/minix/lib/libsffs/write.c
+++ b/minix/lib/libsffs/write.c
@@ -72,7 +72,7 @@ ssize_t do_write(ino_t ino_nr, struct fsdriver_data *data, size_t count,
  */
   struct inode *ino;
 
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((ino = find_inode(ino_nr)) == NULL)
@@ -98,7 +98,7 @@ int do_trunc(ino_t ino_nr, off_t start, off_t end)
   uint64_t delta;
   ssize_t r;
 
-  if (state.s_read_only)
+  if (read_only)
        return EROFS;
 
   if ((ino = find_inode(ino_nr)) == NULL)

diff --git a/minix/lib/libvtreefs/glo.h b/minix/lib/libvtreefs/glo.h
index 0e5fd1a5940ddd5d5c561497f5a4d3d8df9cc24b..49ca2e86e4ff56feedf0efa38a1b4ee9ab8fdc28 100644 (file)
--- a/minix/lib/libvtreefs/glo.h
+++ b/minix/lib/libvtreefs/glo.h
@@ -8,8 +8,6 @@
 
 EXTERN struct fs_hooks *vtreefs_hooks;
 
-EXTERN dev_t fs_dev;
-
 extern struct fsdriver vtreefs_table;
 
 #endif /* _VTREEFS_GLO_H */

diff --git a/minix/lib/libvtreefs/mount.c b/minix/lib/libvtreefs/mount.c
index c94becc7cf74d360d5ee28d7d5b7019581332d3b..f30184bd00d38ee17e9ee68a0aa737a2887eab92 100644 (file)
--- a/minix/lib/libvtreefs/mount.c
+++ b/minix/lib/libvtreefs/mount.c
@@ -7,14 +7,11 @@
  * Mount the file system.  Obtain the root inode and send back its details.
  */
 int
-fs_mount(dev_t dev, unsigned int flags, struct fsdriver_node * root_node,
-       unsigned int * res_flags)
+fs_mount(dev_t __unused dev, unsigned int flags,
+       struct fsdriver_node * root_node, unsigned int * res_flags)
 {
        struct inode *root;
 
-       /* Get the device number, for stat requests. */
-       fs_dev = dev;
-
        /* VTreeFS must not be mounted as a root file system. */
        if (flags & REQ_ISROOT)
                return EINVAL;

diff --git a/minix/lib/libvtreefs/stadir.c b/minix/lib/libvtreefs/stadir.c
index 329c6e065d5ecec0ea12bf13992947348a8c30e4..3f0d17df79e0eddf6932da211829ce122794bab4 100644 (file)
--- a/minix/lib/libvtreefs/stadir.c
+++ b/minix/lib/libvtreefs/stadir.c
@@ -17,7 +17,6 @@ fs_stat(ino_t ino_nr, struct stat * buf)
                return EINVAL;
 
        /* Fill in the basic info. */
-       buf->st_dev = fs_dev;
        buf->st_ino = get_inode_number(node);
        buf->st_mode = node->i_stat.mode;
        buf->st_nlink = !is_inode_deleted(node);